From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 20 Sep 2015 05:38:40 +0000 (+0300)
Subject: Issue #25108: Fixed test_traceback in the case when this test is run twice.
X-Git-Tag: v2.7.11rc1~147
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=63550ee1a280ae667de3d1f0657f5b948ae73e12;p=thirdparty%2FPython%2Fcpython.git

Issue #25108: Fixed test_traceback in the case when this test is run twice.
In this case __file__ is the name of precompiled file (*.py[co]).
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 88e8b7b5fc44..03c4415a0ef7 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -213,10 +213,11 @@ class TracebackFormatTests(unittest.TestCase):
         with captured_output("stderr") as stderr:
             prn()
         lineno = prn.__code__.co_firstlineno
+        file = prn.__code__.co_filename
         self.assertEqual(stderr.getvalue().splitlines()[-4:], [
-            '  File "%s", line %d, in test_print_stack' % (__file__, lineno+3),
+            '  File "%s", line %d, in test_print_stack' % (file, lineno+3),
             '    prn()',
-            '  File "%s", line %d, in prn' % (__file__, lineno+1),
+            '  File "%s", line %d, in prn' % (file, lineno+1),
             '    traceback.print_stack()',
         ])
 
@@ -225,11 +226,12 @@ class TracebackFormatTests(unittest.TestCase):
             return traceback.format_stack()
         result = fmt()
         lineno = fmt.__code__.co_firstlineno
+        file = fmt.__code__.co_filename
         self.assertEqual(result[-2:], [
             '  File "%s", line %d, in test_format_stack\n'
-            '    result = fmt()\n' % (__file__, lineno+2),
+            '    result = fmt()\n' % (file, lineno+2),
             '  File "%s", line %d, in fmt\n'
-            '    return traceback.format_stack()\n' % (__file__, lineno+1),
+            '    return traceback.format_stack()\n' % (file, lineno+1),
         ])
 
 
@@ -243,9 +245,10 @@ class MiscTracebackCases(unittest.TestCase):
             return traceback.extract_stack()
         result = extract()
         lineno = extract.__code__.co_firstlineno
+        file = extract.__code__.co_filename
         self.assertEqual(result[-2:], [
-            (__file__, lineno+2, 'test_extract_stack', 'result = extract()'),
-            (__file__, lineno+1, 'extract', 'return traceback.extract_stack()'),
+            (file, lineno+2, 'test_extract_stack', 'result = extract()'),
+            (file, lineno+1, 'extract', 'return traceback.extract_stack()'),
         ])