Merge pull request #232 from murrayrm/fix-statesp_test-warnings

murrayrm · web-flow · commit 71101bfd00ec · 2018-07-29T15:16:12.000-07:00
Fix numpy generated warnings that are breaking unit tests
diff --git a/control/tests/freqresp_test.py b/control/tests/freqresp_test.py
@@ -141,6 +141,11 @@ def test_discrete(self):
          import warnings
          warnings.simplefilter('always', UserWarning)   # don't supress
          with warnings.catch_warnings(record=True) as w:
+            # Set up warnings filter to only show warnings in control module
+            warnings.filterwarnings("ignore")
+            warnings.filterwarnings("always", module="control")
+
+            # Look for a warning about sampling above Nyquist frequency
             omega_bad = np.linspace(10e-4,1.1,10) * np.pi/sys.dt
             ret = sys.freqresp(omega_bad)
             print("len(w) =", len(w))
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -148,7 +148,11 @@ def testEvalFr(self):
         # Deprecated version of the call (should generate warning)
         import warnings
         with warnings.catch_warnings(record=True) as w:
-            warnings.simplefilter("always")
+            # Set up warnings filter to only show warnings in control module
+            warnings.filterwarnings("ignore")
+            warnings.filterwarnings("always", module="control")
+            
+            # Make sure that we get a pending deprecation warning
             sys.evalfr(1.)
             assert len(w) == 1
             assert issubclass(w[-1].category, PendingDeprecationWarning)
