add fixture editsdefaults and use it in config_test.py

bnavigator · bnavigator · commit 7580cc5fa059 · 2020-07-25T23:38:01.000+02:00
diff --git a/control/tests/config_test.py b/control/tests/config_test.py
@@ -8,24 +8,14 @@
 from math import pi, log10
 
 import matplotlib.pyplot as plt
+from matplotlib.testing.decorators import cleanup as mplcleanup
 import numpy as np
 import pytest
 
 import control as ct
 
 
-@pytest.fixture(scope="module")
-def configtester():
-    # save the current state
-    defaults = ct.config.defaults
-    yield
-    # Get rid of any figures that we created
-    plt.close('all')
-    # Reset the configuration defaults
-    ct.config.defaults = defaults
-
-
-@pytest.mark.usefixtures("configtester")
+@pytest.mark.usefixtures("editsdefaults")
 class TestConfig:
 
     # Create a simple second order system to use for testing
@@ -37,6 +27,7 @@ def test_set_defaults(self):
         assert ct.config.defaults['config.test2'] == 2
         assert ct.config.defaults['config.test3'] is None
 
+    @mplcleanup
     def test_get_param(self):
         assert ct.config._get_param('bode', 'dB')\
             == ct.config.defaults['bode.dB']
@@ -57,7 +48,7 @@ def test_get_param(self):
 
         assert ct.config._get_param('config', 'test4', {'test4': 1}, None) == 1
 
-
+    @mplcleanup
     def test_fbs_bode(self):
         ct.use_fbs_defaults()
 
@@ -104,6 +95,7 @@ def test_fbs_bode(self):
 
         ct.reset_defaults()
 
+    @mplcleanup
     def test_matlab_bode(self):
         ct.use_matlab_defaults()
 
@@ -150,6 +142,7 @@ def test_matlab_bode(self):
 
         ct.reset_defaults()
 
+    @mplcleanup
     def test_custom_bode_default(self):
         ct.config.defaults['bode.dB'] = True
         ct.config.defaults['bode.deg'] = True
@@ -173,6 +166,7 @@ def test_custom_bode_default(self):
 
         ct.reset_defaults()
 
+    @mplcleanup
     def test_bode_number_of_samples(self):
         # Set the number of samples (default is 50, from np.logspace)
         mag_ret, phase_ret, omega_ret = ct.bode_plot(self.sys, omega_num=87)
@@ -189,6 +183,7 @@ def test_bode_number_of_samples(self):
 
         ct.reset_defaults()
 
+    @mplcleanup
     def test_bode_feature_periphery_decade(self):
         # Generate a sample Bode plot to figure out the range it uses
         ct.reset_defaults()     # Make sure starting state is correct
@@ -221,8 +216,9 @@ def test_reset_defaults(self):
         assert ct.config.defaults['freqplot.feature_periphery_decades'] == 1.0
 
     def test_legacy_defaults(self):
-        ct.use_legacy_defaults('0.8.3')
-        assert(isinstance(ct.ss(0,0,0,1).D, np.matrix))
+        with pytest.deprecated_call():
+            ct.use_legacy_defaults('0.8.3')
+            assert(isinstance(ct.ss(0,0,0,1).D, np.matrix))
         ct.reset_defaults()
         assert(isinstance(ct.ss(0,0,0,1).D, np.ndarray))
 
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -41,3 +41,11 @@ def check_deprecated_matrix():
                 pass
     else:
         yield
+
+
+@pytest.fixture(scope="function")
+def editsdefaults():
+    """make sure any changes to the defaults only last during a test"""
+    restore = control.config.defaults.copy()
+    yield
+    control.config.defaults.update(restore)
