Commit4965500

authored

Merge pull request#24113 from QuLogic/warn-types

Add exception class to pytest.warns calls

2 parents6f137b9 +529d26f commit4965500Copy full SHA for 4965500

File tree

-4

lines changed

-4

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -491,13 +491,15 @@ def test_subclass_clear_cla():`
`491`	`491`	`# Note, we cannot use mocking here as we want to be sure that the`
`492`	`492`	`# superclass fallback does not recurse.`
`493`	`493`
`494`		-withpytest.warns(match='Overriding `Axes.cla`'):
	`494`	`+withpytest.warns(PendingDeprecationWarning,`
	`495`	+match='Overriding `Axes.cla`'):
`495`	`496`	`classClaAxes(Axes):`
`496`	`497`	`defcla(self):`
`497`	`498`	`nonlocalcalled`
`498`	`499`	`called=True`
`499`	`500`
`500`		-withpytest.warns(match='Overriding `Axes.cla`'):
	`501`	`+withpytest.warns(PendingDeprecationWarning,`
	`502`	+match='Overriding `Axes.cla`'):
`501`	`503`	`classClaSuperAxes(Axes):`
`502`	`504`	`defcla(self):`
`503`	`505`	`nonlocalcalled`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ def test_double_register_builtin_cmap():`
`117`	`117`	`mpl.colormaps[name],name=name,force=True`
`118`	`118`	`)`
`119`	`119`	`withpytest.raises(ValueError,match='A colormap named "viridis"'):`
`120`		`-withpytest.warns():`
	`120`	`+withpytest.warns(PendingDeprecationWarning):`
`121`	`121`	`cm.register_cmap(name,mpl.colormaps[name])`
`122`	`122`	`withpytest.warns(UserWarning):`
`123`	`123`	`# TODO is warning more than once!`
`@@ -128,7 +128,7 @@ def test_unregister_builtin_cmap():`
`128`	`128`	`name="viridis"`
`129`	`129`	`match=f'cannot unregister{name!r} which is a builtin colormap.'`
`130`	`130`	`withpytest.raises(ValueError,match=match):`
`131`		`-withpytest.warns():`
	`131`	`+withpytest.warns(PendingDeprecationWarning):`
`132`	`132`	`cm.unregister_cmap(name)`
`133`	`133`
`134`	`134`

Comments

(0)