8000 Fix check_figures_equal for tests that use its fixtures. by QuLogic · Pull Request #16800 · matplotlib/matplotlib · GitHub
[go: up one dir, main page]
Skip to content

Fix check_figures_equal for tests that use its fixtures. #16800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
QuLogic merged 1 commit into from
Mar 17, 2020
Merged

Fix check_figures_equal for tests that use its fixtures. #16800

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions lib/matplotlib/testing/decorators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

4319 # reach a bit into pytest internals to hoist the marks from
Expand Down
0