Merge pull request #16800 from QuLogic/checkfigeq

QuLogic · web-flow · commit 7540cdde6d33 · 2020-03-17T04:31:11.000-04:00
Fix check_figures_equal for tests that use its fixtures.
diff --git a/lib/matplotlib/testing/decorators.py b/lib/matplotlib/testing/decorators.py
@@ -389,9 +389,17 @@ def decorator(func):
         import pytest
 
         _, result_dir = _image_directories(func)
+        old_sig = inspect.signature(func)
 
         @pytest.mark.parametrize("ext", extensions)
-        def wrapper(*args, ext, request, **kwargs):
+        def wrapper(*args, **kwargs):
+            ext = kwargs['ext']
+            if 'ext' not in old_sig.parameters:
+                kwargs.pop('ext')
+            request = kwargs['request']
+            if 'request' not in old_sig.parameters:
+                kwargs.pop('request')
+
             file_name = "".join(c for c in request.node.name
                                 if c in ALLOWED_CHARS)
             try:
@@ -409,16 +417,16 @@ def wrapper(*args, ext, request, **kwargs):
                 plt.close(fig_test)
                 plt.close(fig_ref)
 
-        sig = inspect.signature(func)
-        new_sig = sig.replace(
-            parameters=([param
-                         for param in sig.parameters.values()
-                         if param.name not in {"fig_test", "fig_ref"}]
-                        + [
-                            inspect.Parameter("ext", KEYWORD_ONLY),
-                            inspect.Parameter("request", KEYWORD_ONLY),
-                        ])
-        )
+        parameters = [
+            param
+            for param in old_sig.parameters.values()
+            if param.name not in {"fig_test", "fig_ref"}
+        ]
+        if 'ext' not in old_sig.parameters:
+            parameters += [inspect.Parameter("ext", KEYWORD_ONLY)]
+        if 'request' not in old_sig.parameters:
+            parameters += [inspect.Parameter("request", KEYWORD_ONLY)]
+        new_sig = old_sig.replace(parameters=parameters)
         wrapper.__signature__ = new_sig
 
         # reach a bit into pytest internals to hoist the marks from
