Use editsdefaults fixture in test_latex_repr

roryyorke · roryyorke · commit e1bd131fc71c · 2020-08-22T10:10:48.000+02:00
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -16,6 +16,7 @@
 from control.lti import evalfr
 from control.exception import slycot_check
 
+from .conftest import editsdefaults
 
 class TestStateSpace(unittest.TestCase):
     """Tests for the StateSpace class."""
@@ -716,7 +717,7 @@ def test_sample_system_prewarping(self):
                           (LTX_G2, LTX_G2_REF)])
 @pytest.mark.parametrize("repr_type", [None, "partitioned", "separate"])
 @pytest.mark.parametrize("num_format", [None, ".3g", ".5g"])
-def test_latex_repr(g, ref, repr_type, num_format):
+def test_latex_repr(g, ref, repr_type, num_format, editsdefaults):
     """Test `._latex_repr_` with different config values
 
     This is a 'gold image' test, so if you change behaviour,
@@ -725,21 +726,15 @@ def test_latex_repr(g, ref, repr_type, num_format):
         control.reset_defaults()
         print(f'p3_p : {g1._repr_latex_()!r}')
     """
-    from control import set_defaults, reset_defaults
-    try:
-        # add "editsdefaults" fixture and remove the reset_defaults as soon as
-        # gh-438 is merged
-        reset_defaults()
-        if num_format is not None:
-            set_defaults('statesp', latex_num_format=num_format)
-
-        if repr_type is not None:
-            set_defaults('statesp', latex_repr_type=repr_type)
-
-        refkey = "{}_{}".format(refkey_n[num_format], refkey_r[repr_type])
-        assert g._repr_latex_() == ref[refkey]
-    finally:
-        reset_defaults()
+    from control import set_defaults
+    if num_format is not None:
+        set_defaults('statesp', latex_num_format=num_format)
+
+    if repr_type is not None:
+        set_defaults('statesp', latex_repr_type=repr_type)
+
+    refkey = "{}_{}".format(refkey_n[num_format], refkey_r[repr_type])
+    assert g._repr_latex_() == ref[refkey]
 
 
 if __name__ == "__main__":
