@@ -86,7 +86,7 @@ def test_caret(self):
8686 err = self .get_exception_format (self .syntax_error_with_caret ,
8787 SyntaxError )
8888 self .assertEqual (len (err ), 4 )
89- self .assertTrue (err [1 ].strip () == "return x!" )
89+ self .assertEqual (err [1 ].strip (), "return x!" )
9090 self .assertIn ("^" , err [2 ]) # third line has caret
9191 self .assertEqual (err [1 ].find ("!" ), err [2 ].find ("^" )) # in the right place
9292 self .assertEqual (err [2 ].count ("^" ), 1 )
@@ -419,16 +419,10 @@ def do_test(firstlines, message, charset, lineno):
419419 err_line = "raise RuntimeError('{0}')" .format (message_ascii )
420420 err_msg = "RuntimeError: {0}" .format (message_ascii )
421421
422- self .assertIn (("line %s" % lineno ), stdout [1 ],
423- "Invalid line number: {0!r} instead of {1}" .format (
424- stdout [1 ], lineno ))
425- self .assertTrue (stdout [2 ].endswith (err_line ),
426- "Invalid traceback line: {0!r} instead of {1!r}" .format (
427- stdout [2 ], err_line ))
422+ self .assertIn ("line %s" % lineno , stdout [1 ])
423+ self .assertEndsWith (stdout [2 ], err_line )
428424 actual_err_msg = stdout [3 ]
429- self .assertTrue (actual_err_msg == err_msg ,
430- "Invalid error message: {0!r} instead of {1!r}" .format (
431- actual_err_msg , err_msg ))
425+ self .assertEqual (actual_err_msg , err_msg )
432426
433427 do_test ("" , "foo" , "ascii" , 3 )
434428 for charset in ("ascii" , "iso-8859-1" , "utf-8" , "GBK" ):
@@ -1809,9 +1803,9 @@ def check_traceback_format(self, cleanup_func=None):
18091803 banner = tb_lines [0 ]
18101804 self .assertEqual (len (tb_lines ), 5 )
18111805 location , source_line = tb_lines [- 2 ], tb_lines [- 1 ]
1812- self .assertTrue (banner . startswith ( 'Traceback' ) )
1813- self .assertTrue (location . startswith ( ' File' ) )
1814- self .assertTrue (source_line . startswith ( ' raise' ) )
1806+ self .assertStartsWith (banner , 'Traceback' )
1807+ self .assertStartsWith (location , ' File' )
1808+ self .assertStartsWith (source_line , ' raise' )
18151809
18161810 def test_traceback_format (self ):
18171811 self .check_traceback_format ()
@@ -2190,12 +2184,12 @@ def zero_div(self):
21902184 def check_zero_div (self , msg ):
21912185 lines = msg .splitlines ()
21922186 if has_no_debug_ranges ():
2193- self .assertTrue (lines [- 3 ]. startswith ( ' File' ) )
2187+ self .assertStartsWith (lines [- 3 ], ' File' )
21942188 self .assertIn ('1/0 # In zero_div' , lines [- 2 ])
21952189 else :
2196- self .assertTrue (lines [- 4 ]. startswith ( ' File' ) )
2190+ self .assertStartsWith (lines [- 4 ], ' File' )
21972191 self .assertIn ('1/0 # In zero_div' , lines [- 3 ])
2198- self .assertTrue (lines [- 1 ]. startswith ( 'ZeroDivisionError' ), lines [ - 1 ] )
2192+ self .assertStartsWith (lines [- 1 ], 'ZeroDivisionError' )
21992193
22002194 def test_simple (self ):
22012195 try :
@@ -2205,12 +2199,12 @@ def test_simple(self):
22052199 lines = self .get_report (e ).splitlines ()
22062200 if has_no_debug_ranges ():
22072201 self .assertEqual (len (lines ), 4 )
2208- self .assertTrue (lines [3 ]. startswith ( 'ZeroDivisionError' ) )
2202+ self .assertStartsWith (lines [3 ], 'ZeroDivisionError' )
22092203 else :
22102204 self .assertEqual (len (lines ), 5 )
2211- self .assertTrue (lines [4 ]. startswith ( 'ZeroDivisionError' ) )
2212- self .assertTrue (lines [0 ]. startswith ( 'Traceback' ) )
2213- self .assertTrue (lines [1 ]. startswith ( ' File' ) )
2205+ self .assertStartsWith (lines [4 ], 'ZeroDivisionError' )
2206+ self .assertStartsWith (lines [0 ], 'Traceback' )
2207+ self .assertStartsWith (lines [1 ], ' File' )
22142208 self .assertIn ('1/0 # Marker' , lines [2 ])
22152209
22162210 def test_cause (self ):
@@ -2251,9 +2245,9 @@ def test_context_suppression(self):
22512245 e = _
22522246 lines = self .get_report (e ).splitlines ()
22532247 self .assertEqual (len (lines ), 4 )
2254- self .assertTrue (lines [3 ]. startswith ( 'ZeroDivisionError' ) )
2255- self .assertTrue (lines [0 ]. startswith ( 'Traceback' ) )
2256- self .assertTrue (lines [1 ]. startswith ( ' File' ) )
2248+ self .assertStartsWith (lines [3 ], 'ZeroDivisionError' )
2249+ self .assertStartsWith (lines [0 ], 'Traceback' )
2250+ self .assertStartsWith (lines [1 ], ' File' )
22572251 self .assertIn ('ZeroDivisionError from None' , lines [2 ])
22582252
22592253 def test_cause_and_context (self ):
0 commit comments