Skip to content

Commit a7a98a0

Browse files
bnavigatorbnavigator
committed
mark slycot needing tests
1 parent 8d20519 commit a7a98a0

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

‎control/tests/sysnorm_test.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import pytest
1212

1313

14-
@pytest.mark.parametrize("method", ["slycot", "scipy", None])
14+
@pytest.mark.parametrize("method", [pytest.param("slycot", marks=pytest.mark.slycot), "scipy", None])
1515
def test_norm_1st_order_stable_system(method):
1616
"""First-order stable continuous-time system"""
1717
s = ct.tf('s')
@@ -25,7 +25,7 @@ def test_norm_1st_order_stable_system(method):
2525
assert np.allclose(ct.norm(Gd1, p=2, method=method), 0.223513699524858) # Comparison to norm computed in MATLAB
2626

2727

28-
@pytest.mark.parametrize("method", ["slycot", "scipy", None])
28+
@pytest.mark.parametrize("method", [pytest.param("slycot", marks=pytest.mark.slycot), "scipy", None])
2929
def test_norm_1st_order_unstable_system(method):
3030
"""First-order unstable continuous-time system"""
3131
s = ct.tf('s')
@@ -40,7 +40,7 @@ def test_norm_1st_order_unstable_system(method):
4040
with pytest.warns(UserWarning, match="System is unstable!"):
4141
assert ct.norm(Gd2, p=2, method=method) == float('inf') # Comparison to norm computed in MATLAB
4242

43-
@pytest.mark.parametrize("method", ["slycot", "scipy", None])
43+
@pytest.mark.parametrize("method", [pytest.param("slycot", marks=pytest.mark.slycot), "scipy", None])
4444
def test_norm_2nd_order_system_imag_poles(method):
4545
"""Second-order continuous-time system with poles on imaginary axis"""
4646
s = ct.tf('s')
@@ -57,7 +57,7 @@ def test_norm_2nd_order_system_imag_poles(method):
5757
with pytest.warns(UserWarning, match="Poles close to, or on, the complex unit circle."):
5858
assert ct.norm(Gd3, p=2, method=method) == float('inf') # Comparison to norm computed in MATLAB
5959

60-
@pytest.mark.parametrize("method", ["slycot", "scipy", None])
60+
@pytest.mark.parametrize("method", [pytest.param("slycot", marks=pytest.mark.slycot), "scipy", None])
6161
def test_norm_3rd_order_mimo_system(method):
6262
"""Third-order stable MIMO continuous-time system"""
6363
A = np.array([[-1.017041847539126, -0.224182952826418, 0.042538079149249],

0 commit comments

Comments
 (0)