revert rerunfailures, replace mplcleanup decorator with our fixture

bnavigator · bnavigator · commit 9db91cf461b4 · 2022-08-20T10:51:47.000+02:00
diff --git a/.github/conda-env/test-env.yml b/.github/conda-env/test-env.yml
@@ -6,7 +6,6 @@ dependencies:
   - pytest
   - pytest-cov
   - pytest-timeout
-  - pytest-rerunfailures
   - numpy
   - matplotlib
   - scipy
diff --git a/control/tests/config_test.py b/control/tests/config_test.py
@@ -8,7 +8,6 @@
 from math import pi, log10
 
 import matplotlib.pyplot as plt
-from matplotlib.testing.decorators import cleanup as mplcleanup
 import numpy as np
 import pytest
 
@@ -18,7 +17,6 @@
 @pytest.mark.usefixtures("editsdefaults")  # makes sure to reset the defaults
                                            # to the test configuration
 class TestConfig:
-
     # Create a simple second order system to use for testing
     sys = ct.tf([10], [1, 2, 1])
 
@@ -28,8 +26,7 @@ def test_set_defaults(self):
         assert ct.config.defaults['freqplot.deg'] == 2
         assert ct.config.defaults['freqplot.Hz'] is None
 
-    @mplcleanup
-    def test_get_param(self):
+    def test_get_param(self, mplcleanup):
         assert ct.config._get_param('freqplot', 'dB')\
             == ct.config.defaults['freqplot.dB']
         assert ct.config._get_param('freqplot', 'dB', 1) == 1
@@ -92,8 +89,7 @@ def test_default_deprecation(self):
             assert ct.config.defaults['bode.Hz'] \
                 == ct.config.defaults['freqplot.Hz']
 
-    @mplcleanup
-    def test_fbs_bode(self):
+    def test_fbs_bode(self, mplcleanup):
         ct.use_fbs_defaults()
 
         # Generate a Bode plot
@@ -137,8 +133,7 @@ def test_fbs_bode(self):
         phase_x, phase_y = (((plt.gcf().axes[1]).get_lines())[0]).get_data()
         np.testing.assert_almost_equal(phase_y[-1], -pi, decimal=2)
 
-    @mplcleanup
-    def test_matlab_bode(self):
+    def test_matlab_bode(self, mplcleanup):
         ct.use_matlab_defaults()
 
         # Generate a Bode plot
@@ -182,8 +177,7 @@ def test_matlab_bode(self):
         phase_x, phase_y = (((plt.gcf().axes[1]).get_lines())[0]).get_data()
         np.testing.assert_almost_equal(phase_y[-1], -pi, decimal=2)
 
-    @mplcleanup
-    def test_custom_bode_default(self):
+    def test_custom_bode_default(self, mplcleanup):
         ct.config.defaults['freqplot.dB'] = True
         ct.config.defaults['freqplot.deg'] = True
         ct.config.defaults['freqplot.Hz'] = True
@@ -204,8 +198,7 @@ def test_custom_bode_default(self):
         np.testing.assert_almost_equal(mag_y[0], 20*log10(10), decimal=3)
         np.testing.assert_almost_equal(phase_y[-1], -pi, decimal=2)
 
-    @mplcleanup
-    def test_bode_number_of_samples(self):
+    def test_bode_number_of_samples(self, mplcleanup):
         # 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)
         assert len(mag_ret) == 87
@@ -219,8 +212,7 @@ def test_bode_number_of_samples(self):
         mag_ret, phase_ret, omega_ret = ct.bode_plot(self.sys, omega_num=87)
         assert len(mag_ret) == 87
 
-    @mplcleanup
-    def test_bode_feature_periphery_decade(self):
+    def test_bode_feature_periphery_decade(self, mplcleanup):
         # Generate a sample Bode plot to figure out the range it uses
         ct.reset_defaults()     # Make sure starting state is correct
         mag_ret, phase_ret, omega_ret = ct.bode_plot(self.sys, Hz=False)
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -105,7 +105,6 @@ def editsdefaults():
 
 
 @pytest.fixture(scope="function")
-@pytest.mark.flaky(reruns=2, reruns_delay=1)
 def mplcleanup():
     """Clean up any plots and changes a test may have made to matplotlib.
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -40,7 +40,7 @@ dynamic = ["version"]
 packages = ["control"]
 
 [project.optional-dependencies]
-test = ["pytest", "pytest-timeout", "pytest-rerunfailures"]
+test = ["pytest", "pytest-timeout"]
 slycot = [ "slycot>=0.4.0" ]
 cvxopt = [ "cvxopt>=1.2.0" ]
 
