[3.11] gh-116034: fix location info on the error of a failed assertion (#116052)

This commit is contained in:
Irit Katriel 2024-02-28 19:12:16 +00:00 committed by GitHub
parent f225740211
commit 99ab0d49e2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 0 deletions

View file

@ -636,6 +636,23 @@ class TracebackErrorLocationCaretTests(unittest.TestCase):
result_lines = self.get_exception(f_with_binary_operator)
self.assertEqual(result_lines, expected_error.splitlines())
def test_caret_for_failed_assertion(self):
def f_assert():
test = 3
assert test == 1 and test == 2, "Bug found?"
lineno_f = f_assert.__code__.co_firstlineno
expected_error = (
'Traceback (most recent call last):\n'
f' File "{__file__}", line {self.callable_line}, in get_exception\n'
' callable()\n'
f' File "{__file__}", line {lineno_f+2}, in f_assert\n'
' assert test == 1 and test == 2, "Bug found?"\n'
' ^^^^^^^^^^^^^^^^^^^^^^^\n'
)
result_lines = self.get_exception(f_assert)
self.assertEqual(result_lines, expected_error.splitlines())
def test_traceback_specialization_with_syntax_error(self):
bytecode = compile("1 / 0 / 1 / 2\n", TESTFN, "exec")

View file

@ -0,0 +1 @@
Fix location of the error on a failed assertion.

View file

@ -4050,6 +4050,7 @@ compiler_assert(struct compiler *c, stmt_ty s)
ADDOP_I(c, PRECALL, 0);
ADDOP_I(c, CALL, 0);
}
SET_LOC(c, s->v.Assert.test);
ADDOP_I(c, RAISE_VARARGS, 1);
compiler_use_next_block(c, end);
return 1;