Commit11a5c9f

authored

Merge pull request#16036 from anntzer/recwarn

Rely on pytest to record warnings, rather than doing it manually.

2 parentsc041352 +2ad47ca commit11a5c9fCopy full SHA for 11a5c9f

File tree

+20

-36

lines changed

+20

-36

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`importio`
`2`	`2`	`fromitertoolsimportchain`
`3`		`-importwarnings`
`4`	`3`
`5`	`4`	`importnumpyasnp`
`6`	`5`
`@@ -220,13 +219,10 @@ def test_default_edges():`
`220`	`219`	`ax4.add_patch(pp1)`
`221`	`220`
`222`	`221`
`223`		`-deftest_properties():`
	`222`	`+deftest_properties(recwarn):`
`224`	`223`	`ln=mlines.Line2D([], [])`
`225`		`-withwarnings.catch_warnings(record=True)asw:`
`226`		`-# Cause all warnings to always be triggered.`
`227`		`-warnings.simplefilter("always")`
`228`		`-ln.properties()`
`229`		`-assertlen(w)==0`
	`224`	`+ln.properties()`
	`225`	`+assertlen(recwarn)==0`
`230`	`226`
`231`	`227`
`232`	`228`	`deftest_setp():`

Lines changed: 6 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -5283,17 +5283,13 @@ def test_length_one_hist():`
`5283`	`5283`	`ax.hist([1])`
`5284`	`5284`
`5285`	`5285`
`5286`		`-deftest_pathological_hexbin():`
	`5286`	`+deftest_pathological_hexbin(recwarn):`
`5287`	`5287`	`# issue #2863`
`5288`		`-out=io.BytesIO()`
`5289`		`-`
`5290`		`-withwarnings.catch_warnings(record=True)asw:`
`5291`		`-warnings.simplefilter("always")`
`5292`		`-mylist= [10]*100`
`5293`		`-fig,ax=plt.subplots(1,1)`
`5294`		`-ax.hexbin(mylist,mylist)`
`5295`		`-fig.savefig(out)`
`5296`		`-assertlen(w)==0`
	`5288`	`+mylist= [10]*100`
	`5289`	`+fig,ax=plt.subplots(1,1)`
	`5290`	`+ax.hexbin(mylist,mylist)`
	`5291`	`+fig.savefig(io.BytesIO())`
	`5292`	`+assertlen(recwarn)==0`
`5297`	`5293`
`5298`	`5294`
`5299`	`5295`	`deftest_color_None():`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@`
`6`	`6`	`importplatform`
`7`	`7`	`importsys`
`8`	`8`	`importurllib.request`
`9`		`-importwarnings`
`10`	`9`
`11`	`10`	`importnumpyasnp`
`12`	`11`	`fromnumpyimportma`
`@@ -981,11 +980,9 @@ def test_imshow_masked_interpolation():`
`981`	`980`	`ax.axis('off')`
`982`	`981`
`983`	`982`
`984`		`-deftest_imshow_no_warn_invalid():`
`985`		`-withwarnings.catch_warnings(record=True)aswarns:`
`986`		`-warnings.simplefilter("always")`
`987`		`-plt.imshow([[1,2], [3,np.nan]])`
`988`		`-assertlen(warns)==0`
	`983`	`+deftest_imshow_no_warn_invalid(recwarn):`
	`984`	`+plt.imshow([[1,2], [3,np.nan]])`
	`985`	`+assertlen(recwarn)==0`
`989`	`986`
`990`	`987`
`991`	`988`	`@pytest.mark.parametrize(`

Lines changed: 8 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-importwarnings`
`2`	`1`	`importnumpyasnp`
`3`	`2`	`importpytest`
`4`	`3`	`importsys`
`@@ -72,29 +71,25 @@ def test_quiver_arg_sizes():`
`72`	`71`	`plt.quiver(X2,X2,X2,X2,X3)`
`73`	`72`
`74`	`73`
`75`		`-deftest_no_warnings():`
	`74`	`+deftest_no_warnings(recwarn):`
`76`	`75`	`fig,ax=plt.subplots()`
`77`		`-`
`78`	`76`	`X,Y=np.meshgrid(np.arange(15),np.arange(10))`
`79`	`77`	`U=V=np.ones_like(X)`
`80`		`-`
`81`	`78`	`phi= (np.random.rand(15,10)-.5)*150`
`82`		`-withwarnings.catch_warnings(record=True)asw:`
`83`		`-ax.quiver(X,Y,U,V,angles=phi)`
`84`		`-fig.canvas.draw()`
`85`		`-assertlen(w)==0`
	`79`	`+ax.quiver(X,Y,U,V,angles=phi)`
	`80`	`+fig.canvas.draw()`
	`81`	`+assertlen(recwarn)==0`
`86`	`82`
`87`	`83`
`88`		`-deftest_zero_headlength():`
	`84`	`+deftest_zero_headlength(recwarn):`
`89`	`85`	`# Based on report by Doug McNeil:`
`90`	`86`	`# http://matplotlib.1069221.n5.nabble.com/quiver-warnings-td28107.html`
`91`	`87`	`fig,ax=plt.subplots()`
`92`	`88`	`X,Y=np.meshgrid(np.arange(10),np.arange(10))`
`93`	`89`	`U,V=np.cos(X),np.sin(Y)`
`94`		`-withwarnings.catch_warnings(record=True)asw:`
`95`		`-ax.quiver(U,V,headlength=0,headaxislength=0)`
`96`		`-fig.canvas.draw()`
`97`		`-assertlen(w)==0`
	`90`	`+ax.quiver(U,V,headlength=0,headaxislength=0)`
	`91`	`+fig.canvas.draw()`
	`92`	`+assertlen(recwarn)==0`
`98`	`93`
`99`	`94`
`100`	`95`	`@image_comparison(['quiver_animated_test_image.png'])`

Comments

(0)