update tests for dt=0, remove the test_copy_constructor_nodt

bnavigator · bnavigator · commit adc8166b01cd · 2020-12-31T02:23:01.000+01:00
diff --git a/control/tests/discrete_test.py b/control/tests/discrete_test.py
@@ -243,8 +243,6 @@ def testAddition(self, tsys):
             StateSpace.__add__(tsys.mimo_ss1c, tsys.mimo_ss1d)
         with pytest.raises(ValueError):
             StateSpace.__add__(tsys.mimo_ss1d, tsys.mimo_ss2d)
-        with pytest.raises(ValueError):
-            StateSpace.__add__(tsys.siso_ss1d, tsys.siso_ss3d)
 
         # Transfer function addition
         sys = tsys.siso_tf1 + tsys.siso_tf1d
@@ -260,8 +258,6 @@ def testAddition(self, tsys):
             TransferFunction.__add__(tsys.siso_tf1c, tsys.siso_tf1d)
         with pytest.raises(ValueError):
             TransferFunction.__add__(tsys.siso_tf1d, tsys.siso_tf2d)
-        with pytest.raises(ValueError):
-            TransferFunction.__add__(tsys.siso_tf1d, tsys.siso_tf3d)
 
         # State space + transfer function
         sys = tsys.siso_ss1c + tsys.siso_tf1c
@@ -285,8 +281,6 @@ def testMultiplication(self, tsys):
             StateSpace.__mul__(tsys.mimo_ss1c, tsys.mimo_ss1d)
         with pytest.raises(ValueError):
             StateSpace.__mul__(tsys.mimo_ss1d, tsys.mimo_ss2d)
-        with pytest.raises(ValueError):
-            StateSpace.__mul__(tsys.siso_ss1d, tsys.siso_ss3d)
 
         # Transfer function multiplication
         sys = tsys.siso_tf1 * tsys.siso_tf1d
@@ -301,8 +295,6 @@ def testMultiplication(self, tsys):
             TransferFunction.__mul__(tsys.siso_tf1c, tsys.siso_tf1d)
         with pytest.raises(ValueError):
             TransferFunction.__mul__(tsys.siso_tf1d, tsys.siso_tf2d)
-        with pytest.raises(ValueError):
-            TransferFunction.__mul__(tsys.siso_tf1d, tsys.siso_tf3d)
 
         # State space * transfer function
         sys = tsys.siso_ss1c * tsys.siso_tf1c
@@ -328,8 +320,6 @@ def testFeedback(self, tsys):
             feedback(tsys.mimo_ss1c, tsys.mimo_ss1d)
         with pytest.raises(ValueError):
             feedback(tsys.mimo_ss1d, tsys.mimo_ss2d)
-        with pytest.raises(ValueError):
-            feedback(tsys.siso_ss1d, tsys.siso_ss3d)
 
         # Transfer function feedback
         sys = feedback(tsys.siso_tf1, tsys.siso_tf1d)
@@ -344,8 +334,6 @@ def testFeedback(self, tsys):
             feedback(tsys.siso_tf1c, tsys.siso_tf1d)
         with pytest.raises(ValueError):
             feedback(tsys.siso_tf1d, tsys.siso_tf2d)
-        with pytest.raises(ValueError):
-            feedback(tsys.siso_tf1d, tsys.siso_tf3d)
 
         # State space, transfer function
         sys = feedback(tsys.siso_ss1c, tsys.siso_tf1c)
diff --git a/control/tests/iosys_test.py b/control/tests/iosys_test.py
@@ -1024,7 +1024,7 @@ def test_duplicates(self, tsys):
         # Nonduplicate objects
         nlios1 = nlios.copy()
         nlios2 = nlios.copy()
-        with pytest.warns(UserWarning, match="copy of sys") as record:
+        with pytest.warns(UserWarning, match="Duplicate name"):
             ios_series = nlios1 * nlios2
             assert "copy of sys_1.x[0]" in ios_series.state_index.keys()
             assert "copy of sys.x[0]" in ios_series.state_index.keys()
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -164,22 +164,6 @@ def test_copy_constructor(self):
         linsys.A[0, 0] = -3
         np.testing.assert_array_equal(cpysys.A, [[-1]])  # original value
 
-    def test_copy_constructor_nodt(self, sys322):
-        """Test the copy constructor when an object without dt is passed
-
-        FIXME: may be obsolete in case gh-431 is updated
-        """
-        sysin = sample_system(sys322, 1.)
-        del sysin.dt
-        sys = StateSpace(sysin)
-        assert sys.dt == defaults['control.default_dt']
-
-        # test for static gain
-        sysin = StateSpace([], [], [], [[1, 2], [3, 4]], 1.)
-        del sysin.dt
-        sys = StateSpace(sysin)
-        assert sys.dt is None
-
     def test_matlab_style_constructor(self):
         """Use (deprecated) matrix-style construction string"""
         with pytest.deprecated_call():
