[Python-checkins] cpython (2.7): Issue #25108: Fixed test_traceback in the case when this test is run twice.
serhiy.storchaka
python-checkins at python.org
Sun Sep 20 07:39:25 CEST 2015
https://hg.python.org/cpython/rev/7e718bbf5152
changeset: 98078:7e718bbf5152
branch: 2.7
parent: 98067:fe84898fbe98
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Sep 20 08:38:40 2015 +0300
summary:
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]).
files:
Lib/test/test_traceback.py | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -213,10 +213,11 @@
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 @@
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 @@
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()'),
])
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list