Skip to content

Commit 1cf3ec7

Browse files
committed
xfail ill-conditioned passive test (issue #761)
1 parent dc74aec commit 1cf3ec7

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

control/tests/passivity_test.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'''
2-
Author: Mark Yeatman
2+
Author: Mark Yeatman
33
Date: May 30, 2022
44
'''
55
import pytest
@@ -99,20 +99,17 @@ def test_system_dimension():
9999

100100

101101
@pytest.mark.parametrize(
102-
"test_input,expected",
102+
"systemmatrices, expected",
103103
[((A, B, C, D*0.0), True),
104104
((A_d, B, C, D), True),
105-
((A*1e12, B, C, D*0), True),
105+
pytest.param((A*1e12, B, C, D*0), True,
106+
marks=pytest.mark.xfail(reason="gh-761")),
106107
((A, B*0, C*0, D), True),
107108
((A*0, B, C, D), True),
108109
((A*0, B*0, C*0, D*0), True)])
109-
def test_ispassive_edge_cases(test_input, expected):
110-
A = test_input[0]
111-
B = test_input[1]
112-
C = test_input[2]
113-
D = test_input[3]
114-
sys = ss(A, B, C, D)
115-
assert(passivity.ispassive(sys) == expected)
110+
def test_ispassive_edge_cases(systemmatrices, expected):
111+
sys = ss(*systemmatrices)
112+
assert passivity.ispassive(sys) == expected
116113

117114

118115
def test_rho_and_nu_are_none():

0 commit comments

Comments
 (0)