From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 5 Sep 2017 23:07:44 +0000 (+0200)
Subject: bpo-30445: Allow appended output in RecursionError message (#3356)
X-Git-Tag: v3.6.3rc1~92
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fce7ea893dc3f69b607dd6ef48c2d3d0f6ca414;p=thirdparty%2FPython%2Fcpython.git

bpo-30445: Allow appended output in RecursionError message (#3356)

Running under coverage sometimes causes 'in comparison' to be added to the end of the RecursionError message, which is acceptable.

Patched by Maria Mckinley

(cherry picked from commit 3480ef9dd3177be8c0d71a74853dca6e5b11fbe1)
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 7276bc7ee790..e4833535890d 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -344,7 +344,8 @@ class TracebackFormatTests(unittest.TestCase):
         # 2nd last line contains the repetition count
         self.assertEqual(actual[:-2], expected[:-2])
         self.assertRegex(actual[-2], expected[-2])
-        self.assertEqual(actual[-1], expected[-1])
+        # last line can have additional text appended
+        self.assertIn(expected[-1], actual[-1])
 
         # Check the recursion count is roughly as expected
         rec_limit = sys.getrecursionlimit()