@@ -164,17 +164,18 @@ def setUp(self):
164164 def test_countmatches_as_unit (self ):
165165 expected , output , errors , exit_status = self ._run_command ('countmatches' , action = 'getinfo' , protocol = 1 )
166166 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
167- self .assertEqual ('' , errors )
167+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
168168 self ._compare_csv_files_time_sensitive (expected , output )
169169
170170 expected , output , errors , exit_status = self ._run_command ('countmatches' , action = 'execute' , protocol = 1 )
171171 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
172- self .assertEqual ('' , errors )
172+
173+ self .assertEqual ('' , errors , msg = six .text_type (errors ))
173174 self ._compare_csv_files_time_sensitive (expected , output )
174175
175176 expected , output , errors , exit_status = self ._run_command ('countmatches' )
176177 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
177- self .assertEqual ('' , errors )
178+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
178179 self ._compare_chunks (expected , output )
179180
180181 return
@@ -183,17 +184,17 @@ def test_generatehello_as_unit(self):
183184
184185 expected , output , errors , exit_status = self ._run_command ('generatehello' , action = 'getinfo' , protocol = 1 )
185186 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
186- self .assertEqual ('' , errors )
187+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
187188 self ._compare_csv_files_time_sensitive (expected , output )
188189
189190 expected , output , errors , exit_status = self ._run_command ('generatehello' , action = 'execute' , protocol = 1 )
190191 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
191- self .assertEqual ('' , errors )
192+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
192193 self ._compare_csv_files_time_insensitive (expected , output )
193194
194195 expected , output , errors , exit_status = self ._run_command ('generatehello' )
195196 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
196- self .assertEqual ('' , errors )
197+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
197198 self ._compare_chunks (expected , output , time_sensitive = False )
198199
199200 return
@@ -203,17 +204,17 @@ def test_pypygeneratetext_as_unit(self):
203204
204205 expected , output , errors , exit_status = self ._run_command ('pypygeneratetext' , action = 'getinfo' , protocol = 1 )
205206 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
206- self .assertEqual ('' , errors )
207+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
207208 self ._compare_csv_files_time_sensitive (expected , output )
208209
209210 expected , output , errors , exit_status = self ._run_command ('pypygeneratetext' , action = 'execute' , protocol = 1 )
210211 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
211- self .assertEqual ('' , errors )
212+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
212213 self ._compare_csv_files_time_insensitive (expected , output )
213214
214215 expected , output , errors , exit_status = self ._run_command ('pypygeneratetext' )
215216 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
216- self .assertEqual ('' , errors )
217+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
217218 self ._compare_chunks (expected , output , time_sensitive = False )
218219
219220 return
@@ -222,32 +223,32 @@ def test_sum_as_unit(self):
222223
223224 expected , output , errors , exit_status = self ._run_command ('sum' , action = 'getinfo' , phase = 'reduce' , protocol = 1 )
224225 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
225- self .assertEqual ('' , errors )
226+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
226227 self ._compare_csv_files_time_sensitive (expected , output )
227228
228229 expected , output , errors , exit_status = self ._run_command ('sum' , action = 'getinfo' , phase = 'map' , protocol = 1 )
229230 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
230- self .assertEqual ('' , errors )
231+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
231232 self ._compare_csv_files_time_sensitive (expected , output )
232233
233234 expected , output , errors , exit_status = self ._run_command ('sum' , action = 'execute' , phase = 'map' , protocol = 1 )
234235 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
235- self .assertEqual ('' , errors )
236+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
236237 self ._compare_csv_files_time_sensitive (expected , output )
237238
238239 expected , output , errors , exit_status = self ._run_command ('sum' , action = 'execute' , phase = 'reduce' , protocol = 1 )
239240 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
240- self .assertEqual ('' , errors )
241+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
241242 self ._compare_csv_files_time_sensitive (expected , output )
242243
243244 expected , output , errors , exit_status = self ._run_command ('sum' , phase = 'map' )
244245 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
245- self .assertEqual ('' , errors )
246+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
246247 self ._compare_chunks (expected , output )
247248
248249 expected , output , errors , exit_status = self ._run_command ('sum' , phase = 'reduce' )
249250 self .assertEqual (0 , exit_status , msg = six .text_type (errors ))
250- self .assertEqual ('' , errors )
251+ self .assertEqual ('' , errors , msg = six . text_type ( errors ) )
251252 self ._compare_chunks (expected , output )
252253
253254 return
0 commit comments