shortened testing code as suggested by @bnavigator

sawyerbfuller · sawyerbfuller · commit 2aeab183b87a · 2021-11-09T14:38:37.000-08:00
diff --git a/control/tests/mateqn_test.py b/control/tests/mateqn_test.py
@@ -325,5 +325,3 @@ def test_raise(self):
                 cdare(A, B, Qfs, R, S, E)
             with pytest.raises(ValueError):
                 cdare(A, B, Q, Rfs, S, E)
-            with pytest.raises(ValueError):
-                cdare(A, B, Q, R, S)
diff --git a/control/tests/statefbk_test.py b/control/tests/statefbk_test.py
@@ -399,48 +399,32 @@ def test_DLQE(self, matarrayin):
         L, P, poles = dlqe(A, G, C, QN, RN)
         self.check_DLQE(L, P, poles, G, QN, RN)
 
-    def test_care(self, matarrayin):
-        """Test stabilizing feedback, continuous"""
+    @pytest.mark.parametrize(
+        "stabilizing", 
+        [True, pytest.param(False, marks=slycotonly)])
+    def test_care(self, matarrayin, stabilizing):
+        """Test stabilizing and anti-stabilizing feedback, continuous"""
         A = matarrayin(np.diag([1, -1]))
         B = matarrayin(np.identity(2))
         Q = matarrayin(np.identity(2))
         R = matarrayin(np.identity(2))
         S = matarrayin(np.zeros((2, 2)))
         E = matarrayin(np.identity(2))
-        X, L, G = care(A, B, Q, R, S, E, stabilizing=True)
-        assert np.all(np.real(L) < 0)
+        X, L, G = care(A, B, Q, R, S, E, stabilizing=stabilizing)
+        sgn = {True: -1, False: 1}[stabilizing]
+        assert np.all(sgn * np.real(L) > 0)
         
-    @slycotonly
-    def test_care_antistabilizing(self, matarrayin):
-        """Test anti-stabilizing feedbacks, continuous"""
-        A = matarrayin(np.diag([1, -1]))
-        B = matarrayin(np.identity(2))
-        Q = matarrayin(np.identity(2))
-        R = matarrayin(np.identity(2))
-        S = matarrayin(np.zeros((2, 2)))
-        E = matarrayin(np.identity(2))
-        X, L, G = care(A, B, Q, R, S, E, stabilizing=False)
-        assert np.all(np.real(L) > 0)
-
-    def test_dare(self, matarrayin):
-        """Test stabilizing feedback, discrete"""
-        A = matarrayin(np.diag([0.5, 2]))
-        B = matarrayin(np.identity(2))
-        Q = matarrayin(np.identity(2))
-        R = matarrayin(np.identity(2))
-        S = matarrayin(np.zeros((2, 2)))
-        E = matarrayin(np.identity(2))
-        X, L, G = dare(A, B, Q, R, S, E, stabilizing=True)
-        assert np.all(np.abs(L) < 1)
-
-    @slycotonly
-    def test_dare_antistabilizing(self, matarrayin):
-        """Test anti-stabilizing feedbacks, discrete"""
+    @pytest.mark.parametrize(
+        "stabilizing", 
+        [True, pytest.param(False, marks=slycotonly)])
+    def test_dare(self, matarrayin, stabilizing):
+        """Test stabilizing and anti-stabilizing feedback, discrete"""
         A = matarrayin(np.diag([0.5, 2]))
         B = matarrayin(np.identity(2))
         Q = matarrayin(np.identity(2))
         R = matarrayin(np.identity(2))
         S = matarrayin(np.zeros((2, 2)))
         E = matarrayin(np.identity(2))
-        X, L, G = dare(A, B, Q, R, S, E, stabilizing=False)
-        assert np.all(np.abs(L) > 1)
+        X, L, G = dare(A, B, Q, R, S, E, stabilizing=stabilizing)
+        sgn = {True: -1, False: 1}[stabilizing]
+        assert np.all(sgn * (np.abs(L) - 1) > 0)
