@@ -132,95 +132,3 @@ def nosetest_manual_text_removal():
132
132
133
133
assert len (w ) == 1
134
134
assert 'remove_text function was deprecated in version 2.1.' in str (w [0 ])
135
-
136
-
137
- @pytest .mark .parametrize (
138
- 'func, kwargs, errors, failures, dots' ,
139
- [
140
- (nosetest_empty , {'baseline_images' : []}, [], [], '' ),
141
- (nosetest_empty , {'baseline_images' : ['foo' ]},
142
- [(AssertionError ,
143
- 'Test generated 0 images but there are 1 baseline images' )],
144
- [],
145
- 'E' ),
146
- (nosetest_simple_figure ,
147
- {'baseline_images' : ['basn3p02' ], 'extensions' : ['png' ],
148
- 'remove_text' : True },
149
- [],
150
- [(ImageComparisonFailure , 'Image sizes do not match expected size:' )],
151
- 'F' ),
152
- (nosetest_simple_figure ,
153
- {'baseline_images' : ['simple' ]},
154
- [],
155
- [(ImageComparisonFailure , 'images not close' )] * 3 ,
156
- 'FFF' ),
157
- (nosetest_simple_figure ,
158
- {'baseline_images' : ['simple' ], 'remove_text' : True },
159
- [],
160
- [],
161
- '...' ),
162
- (nosetest_manual_text_removal ,
163
- {'baseline_images' : ['simple' ]},
164
- [],
165
- [],
166
- '...' ),
167
- ],
168
- ids = [
169
- 'empty' ,
170
- 'extra baselines' ,
171
- 'incorrect shape' ,
172
- 'failing figure' ,
173
- 'passing figure' ,
174
- 'manual text removal' ,
175
- ])
176
- def test_nose_image_comparison (func , kwargs , errors , failures , dots ,
177
- monkeypatch ):
178
- nose = pytest .importorskip ('nose' )
179
- monkeypatch .setattr ('matplotlib._called_from_pytest' , False )
180
-
181
- class TestResultVerifier (nose .result .TextTestResult ):
182
- def __init__ (self , * args , ** kwargs ):
183
- super (TestResultVerifier , self ).__init__ (* args , ** kwargs )
184
- self .error_count = 0
185
- self .failure_count = 0
186
-
187
- def addError (self , test , err ):
188
- super (TestResultVerifier , self ).addError (test , err )
189
-
190
- if self .error_count < len (errors ):
191
- assert err [0 ] is errors [self .error_count ][0 ]
192
- assert errors [self .error_count ][1 ] in str (err [1 ])
193
- else :
194
- raise err [1 ]
195
- self .error_count += 1
196
-
197
- def addFailure (self , test , err ):
198
- super (TestResultVerifier , self ).addFailure (test , err )
199
-
200
- assert self .failure_count < len (failures ), err [1 ]
201
- assert err [0 ] is failures [self .failure_count ][0 ]
202
- assert failures [self .failure_count ][1 ] in str (err [1 ])
203
- self .failure_count += 1
204
-
205
- # Make sure that multiple extensions work, but don't require LaTeX or
206
- # Inkscape to do so.
207
- kwargs .setdefault ('extensions' , ['png' , 'png' , 'png' ])
208
-
209
- func = image_comparison (** kwargs )(func )
210
- loader = nose .loader .TestLoader ()
211
- suite = loader .loadTestsFromGenerator (
212
- func ,
213
- 'matplotlib.tests.test_compare_images' )
214
- if six .PY2 :
215
- output = io .BytesIO ()
216
- else :
217
- output = io .StringIO ()
218
- result = TestResultVerifier (stream = output , descriptions = True , verbosity = 1 )
219
- with warnings .catch_warnings ():
220
- # Nose uses deprecated stuff; we don't care about it.
221
- warnings .simplefilter ('ignore' , DeprecationWarning )
222
- suite .run (result = result )
223
-
224
- assert output .getvalue () == dots
225
- assert result .error_count == len (errors )
226
- assert result .failure_count == len (failures )
0 commit comments