small fixes to address bnavigator review

murrayrm · murrayrm · commit 4ec6377f1b44 · 2021-01-14T09:02:11.000-08:00
diff --git a/control/tests/iosys_test.py b/control/tests/iosys_test.py
@@ -427,7 +427,7 @@ def test_algebraic_loop(self, tsys):
         # Nonlinear system composed with LTI system (series) -- with states
         ios_t, ios_y = ios.input_output_response(
             nlios * lnios * nlios, T, U, X0)
-        lti_t, lti_y, = ct.forced_response(linsys, T, U*U, X0)
+        lti_t, lti_y = ct.forced_response(linsys, T, U*U, X0)
         np.testing.assert_array_almost_equal(ios_y, lti_y*lti_y, decimal=3)
 
         # Nonlinear system in feeback loop with LTI system
@@ -483,7 +483,7 @@ def test_summer(self, tsys):
         U = [np.sin(T), np.cos(T)]
         X0 = 0
 
-        lin_t, lin_y, = ct.forced_response(linsys_parallel, T, U, X0)
+        lin_t, lin_y = ct.forced_response(linsys_parallel, T, U, X0)
         ios_t, ios_y = ios.input_output_response(iosys_parallel, T, U, X0)
         np.testing.assert_allclose(ios_y, lin_y,atol=0.002,rtol=0.)
 
diff --git a/control/tests/lti_test.py b/control/tests/lti_test.py
@@ -180,8 +180,8 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):
         if fcn == ct.frd:
             sys = fcn(ct.rss(nstate, nout, ninp), omega)
         elif fcn == ct.tf and (nout > 1 or ninp > 1) and not slycot_check():
-            # Conversion of MIMO systems to transfer functions require slycot
-            return
+            pytest.skip("Conversion of MIMO systems to transfer functions "
+                        "requires slycot.")
         else:
             sys = fcn(ct.rss(nstate, nout, ninp))
 
diff --git a/control/tests/timeresp_test.py b/control/tests/timeresp_test.py
@@ -724,8 +724,8 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):
 
         # Define the system
         if fcn == ct.tf and (nout > 1 or ninp > 1) and not slycot_check():
-            # Conversion of MIMO systems to transfer functions require slycot
-            return
+            pytest.skip("Conversion of MIMO systems to transfer functions "
+                        "requires slycot.")
         else:
             sys = fcn(ct.rss(nstate, nout, ninp, strictly_proper=True))
         
@@ -753,7 +753,7 @@ def test_squeeze(self, fcn, nstate, nout, ninp, squeeze, shape):
         else:
             assert xvec.shape[1] == 8
 
-        # Test cases were we choose a subset of inputs and outputs
+        # Test cases where we choose a subset of inputs and outputs
         _, yvec = ct.step_response(
             sys, tvec, input=ninp-1, output=nout-1, squeeze=squeeze)
         if squeeze is False:
