From 381a9bce9762fe2db4a7951f689df4d06ba53f79 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 24 Mar 2015 14:01:32 +0100 Subject: [PATCH] Issue #23571: Update test_capi --- Lib/test/test_capi.py | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index fc48e386c11..8a92d6ba29e 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -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: returned NULL ' + br'without setting an error\n' + br'\n' + br'Current thread.*:\n' + br' File .*", line 6 in ') 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: ' + br'returned a result with an error set\n' + br'\n' + br'Current thread.*:\n' + br' File .*, line 6 in ') else: with self.assertRaises(SystemError) as cm: _testcapi.return_result_with_error()