Issue #23571: Update test_capi

This commit is contained in:
Victor Stinner 2015-03-24 14:01:32 +01:00
parent e0deff31d3
commit 381a9bce97
1 changed files with 23 additions and 2 deletions

View File

@ -184,7 +184,15 @@ class CAPITest(unittest.TestCase):
_testcapi.return_null_without_error()
""")
rc, out, err = assert_python_failure('-c', code)
self.assertIn(b'_Py_CheckFunctionResult', err)
self.assertRegex(err.replace(b'\r', b''),
br'Fatal Python error: '
br'Function result is invalid\n'
br'SystemError: <built-in function '
br'return_null_without_error> returned NULL '
br'without setting an error\n'
br'\n'
br'Current thread.*:\n'
br' File .*", line 6 in <module>')
else:
with self.assertRaises(SystemError) as cm:
_testcapi.return_null_without_error()
@ -203,7 +211,20 @@ class CAPITest(unittest.TestCase):
_testcapi.return_result_with_error()
""")
rc, out, err = assert_python_failure('-c', code)
self.assertIn(b'_Py_CheckFunctionResult', err)
self.assertRegex(err.replace(b'\r', b''),
br'Fatal Python error: '
br'Function result is invalid\n'
br'ValueError\n'
br'\n'
br'During handling of the above exception, '
br'another exception occurred:\n'
br'\n'
br'SystemError: <built-in '
br'function return_result_with_error> '
br'returned a result with an error set\n'
br'\n'
br'Current thread.*:\n'
br' File .*, line 6 in <module>')
else:
with self.assertRaises(SystemError) as cm:
_testcapi.return_result_with_error()