mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-71339: Use new assertion methods in test_traceback (GH-128848)

This commit is contained in:
Serhiy Storchaka 2025-01-20 11:22:33 +02:00 committed by GitHub
parent 485d2e831e
commit c463270c73
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Lib/test/test_traceback.py
View File

@ -86,7 +86,7 @@ def test_caret(self):
err = self.get_exception_format(self.syntax_error_with_caret, err = self.get_exception_format(self.syntax_error_with_caret,
SyntaxError) SyntaxError)
self.assertEqual(len(err), 4) self.assertEqual(len(err), 4)
self.assertTrue(err[1].strip() == "return x!") self.assertEqual(err[1].strip(), "return x!")
self.assertIn("^", err[2]) # third line has caret self.assertIn("^", err[2]) # third line has caret
self.assertEqual(err[1].find("!"), err[2].find("^")) # in the right place self.assertEqual(err[1].find("!"), err[2].find("^")) # in the right place
self.assertEqual(err[2].count("^"), 1) self.assertEqual(err[2].count("^"), 1)
@ -419,16 +419,10 @@ def do_test(firstlines, message, charset, lineno):
err_line = "raise RuntimeError('{0}')".format(message_ascii) err_line = "raise RuntimeError('{0}')".format(message_ascii)
err_msg = "RuntimeError: {0}".format(message_ascii) err_msg = "RuntimeError: {0}".format(message_ascii)
self.assertIn(("line %s" % lineno), stdout[1], self.assertIn("line %s" % lineno, stdout[1])
"Invalid line number: {0!r} instead of {1}".format( self.assertEndsWith(stdout[2], err_line)
stdout[1], lineno))
self.assertTrue(stdout[2].endswith(err_line),
"Invalid traceback line: {0!r} instead of {1!r}".format(
stdout[2], err_line))
actual_err_msg = stdout[3] actual_err_msg = stdout[3]
self.assertTrue(actual_err_msg == err_msg, self.assertEqual(actual_err_msg, err_msg)
"Invalid error message: {0!r} instead of {1!r}".format(
actual_err_msg, err_msg))
do_test("", "foo", "ascii", 3) do_test("", "foo", "ascii", 3)
for charset in ("ascii", "iso-8859-1", "utf-8", "GBK"): for charset in ("ascii", "iso-8859-1", "utf-8", "GBK"):
@ -1809,9 +1803,9 @@ def check_traceback_format(self, cleanup_func=None):
banner = tb_lines[0] banner = tb_lines[0]
self.assertEqual(len(tb_lines), 5) self.assertEqual(len(tb_lines), 5)
location, source_line = tb_lines[-2], tb_lines[-1] location, source_line = tb_lines[-2], tb_lines[-1]
self.assertTrue(banner.startswith('Traceback')) self.assertStartsWith(banner, 'Traceback')
self.assertTrue(location.startswith(' File')) self.assertStartsWith(location, ' File')
self.assertTrue(source_line.startswith(' raise')) self.assertStartsWith(source_line, ' raise')
def test_traceback_format(self): def test_traceback_format(self):
self.check_traceback_format() self.check_traceback_format()
@ -2190,12 +2184,12 @@ def zero_div(self):
def check_zero_div(self, msg): def check_zero_div(self, msg):
lines = msg.splitlines() lines = msg.splitlines()
if has_no_debug_ranges(): if has_no_debug_ranges():
self.assertTrue(lines[-3].startswith(' File')) self.assertStartsWith(lines[-3], ' File')
self.assertIn('1/0 # In zero_div', lines[-2]) self.assertIn('1/0 # In zero_div', lines[-2])
else: else:
self.assertTrue(lines[-4].startswith(' File')) self.assertStartsWith(lines[-4], ' File')
self.assertIn('1/0 # In zero_div', lines[-3]) self.assertIn('1/0 # In zero_div', lines[-3])
self.assertTrue(lines[-1].startswith('ZeroDivisionError'), lines[-1]) self.assertStartsWith(lines[-1], 'ZeroDivisionError')
def test_simple(self): def test_simple(self):
try: try:
@ -2205,12 +2199,12 @@ def test_simple(self):
lines = self.get_report(e).splitlines() lines = self.get_report(e).splitlines()
if has_no_debug_ranges(): if has_no_debug_ranges():
self.assertEqual(len(lines), 4) self.assertEqual(len(lines), 4)
self.assertTrue(lines[3].startswith('ZeroDivisionError')) self.assertStartsWith(lines[3], 'ZeroDivisionError')
else: else:
self.assertEqual(len(lines), 5) self.assertEqual(len(lines), 5)
self.assertTrue(lines[4].startswith('ZeroDivisionError')) self.assertStartsWith(lines[4], 'ZeroDivisionError')
self.assertTrue(lines[0].startswith('Traceback')) self.assertStartsWith(lines[0], 'Traceback')
self.assertTrue(lines[1].startswith(' File')) self.assertStartsWith(lines[1], ' File')
self.assertIn('1/0 # Marker', lines[2]) self.assertIn('1/0 # Marker', lines[2])
def test_cause(self): def test_cause(self):
@ -2251,9 +2245,9 @@ def test_context_suppression(self):
e = _ e = _
lines = self.get_report(e).splitlines() lines = self.get_report(e).splitlines()
self.assertEqual(len(lines), 4) self.assertEqual(len(lines), 4)
self.assertTrue(lines[3].startswith('ZeroDivisionError')) self.assertStartsWith(lines[3], 'ZeroDivisionError')
self.assertTrue(lines[0].startswith('Traceback')) self.assertStartsWith(lines[0], 'Traceback')
self.assertTrue(lines[1].startswith(' File')) self.assertStartsWith(lines[1], ' File')
self.assertIn('ZeroDivisionError from None', lines[2]) self.assertIn('ZeroDivisionError from None', lines[2])
def test_cause_and_context(self): def test_cause_and_context(self):