Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

(Merge 3.4) Issue #25274: test_recursionlimit_recovery() of test_sys now checks 

sys.gettrace() when the test is executed, not when the module is loaded.

sys.settrace() may be after after the test is loaded.
This commit is contained in:
Victor Stinner 2015-10-01 08:56:27 +02:00
parent 313242aa03 3f18f10f39
commit 87bddbac9d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/test/test_sys.py
View File

@ -197,9 +197,10 @@ class SysModuleTest(unittest.TestCase):
self.assertEqual(sys.getrecursionlimit(), 10000) self.assertEqual(sys.getrecursionlimit(), 10000)
sys.setrecursionlimit(oldlimit) sys.setrecursionlimit(oldlimit)
@unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
'fatal error if run with a trace function')
def test_recursionlimit_recovery(self): def test_recursionlimit_recovery(self):
if hasattr(sys, 'gettrace') and sys.gettrace():
self.skipTest('fatal error if run with a trace function')
# NOTE: this test is slightly fragile in that it depends on the current # NOTE: this test is slightly fragile in that it depends on the current
# recursion count when executing the test being low enough so as to # recursion count when executing the test being low enough so as to
# trigger the recursion recovery detection in the _Py_MakeEndRecCheck # trigger the recursion recovery detection in the _Py_MakeEndRecCheck