Commit2efbdd6

authored

Merge pull request#12339 from meeseeksmachine/auto-backport-of-pr-12297-on-v3.0.x

Backport PR#12297 on branch v3.0.x (Remove some pytest parameterising warnings)

2 parents3c5ef6b +6a92503 commit2efbdd6Copy full SHA for 2efbdd6

File tree

+13

-10

lines changed

+13

-10

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,8 @@ def test_embed_limit(method_name, caplog, tmpdir):`
`229`	`229`	`@pytest.mark.parametrize(`
`230`	`230`	`"method_name",`
`231`	`231`	`["to_html5_video",`
`232`		`-pytest.mark.xfail("to_jshtml")])# Needs to be fixed.`
	`232`	`+pytest.param("to_jshtml",`
	`233`	`+marks=pytest.mark.xfail)])`
`233`	`234`	`deftest_cleanup_temporaries(method_name,tmpdir):`
`234`	`235`	`withtmpdir.as_cwd():`
`235`	`236`	`getattr(make_animation(frames=1),method_name)()`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,14 +27,14 @@`
`27`	`27`	`@pytest.mark.flaky(reruns=3)`
`28`	`28`	`@pytest.mark.parametrize('format, use_log, rcParams', [`
`29`	`29`	`('ps',False, {}),`
`30`		`-needs_ghostscript(`
`31`		`-('ps',False, {'ps.usedistiller':'ghostscript'})),`
`32`		`-needs_usetex(needs_ghostscript(`
`33`		`-('ps',False, {'text.usetex':True}))),`
	`30`	`+pytest.param('ps',False, {'ps.usedistiller':'ghostscript'},`
	`31`	`+marks=needs_ghostscript),`
	`32`	`+pytest.param('ps',False, {'text.usetex':True},`
	`33`	`+marks=[needs_ghostscript,needs_usetex]),`
`34`	`34`	`('eps',False, {}),`
`35`	`35`	`('eps',True, {'ps.useafm':True}),`
`36`		`-needs_usetex(needs_ghostscript(`
`37`		`-('eps',False, {'text.usetex':True}))),`
	`36`	`+pytest.param('eps',False, {'text.usetex':True},`
	`37`	`+marks=[needs_ghostscript,needs_usetex]),`
`38`	`38`	`],ids=[`
`39`	`39`	`'ps',`
`40`	`40`	`'ps with distiller',`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def _test_determinism_save(filename, usetex):`
`126`	`126`	`"filename, usetex",`
`127`	`127`	`# unique filenames to allow for parallel testing`
`128`	`128`	`[("determinism_notex.svg",False),`
`129`		`-needs_usetex(("determinism_tex.svg",True))])`
	`129`	`+pytest.param("determinism_tex.svg",True,marks=needs_usetex)])`
`130`	`130`	`deftest_determinism(filename,usetex):`
`131`	`131`	`importsys`
`132`	`132`	`fromsubprocessimportcheck_output,STDOUT,CalledProcessError`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,10 @@ def _get_testable_interactive_backends():`
`32`	`32`	`reason="No $DISPLAY"`
`33`	`33`	`elifany(importlib.util.find_spec(dep)isNonefordepindeps):`
`34`	`34`	`reason="Missing dependency"`
`35`		`-backends.append(pytest.mark.skip(reason=reason)(backend)ifreason`
`36`		`-elsebackend)`
	`35`	`+ifreason:`
	`36`	`+backend=pytest.param(`
	`37`	`+backend,marks=pytest.mark.skip(reason=reason))`
	`38`	`+backends.append(backend)`
`37`	`39`	`returnbackends`
`38`	`40`
`39`	`41`

Comments

(0)