summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-10-01 06:55:33 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-10-01 06:55:33 (GMT)
commit3f18f10f39a55963e63d544382f0e17668ed97e8 (patch)
tree7ba811a9412ea44932630fe4eb13e311f8ea40a8 /Lib
parent1c62b52c3f2dceeaab99b1599c8654279fe5225f (diff)
downloadcpython-3f18f10f39a55963e63d544382f0e17668ed97e8.zip
cpython-3f18f10f39a55963e63d544382f0e17668ed97e8.tar.gz
cpython-3f18f10f39a55963e63d544382f0e17668ed97e8.tar.bz2
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.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_sys.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index a6d926f..b7ddbe9 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -197,9 +197,10 @@ class SysModuleTest(unittest.TestCase):
self.assertEqual(sys.getrecursionlimit(), 10000)
sys.setrecursionlimit(oldlimit)
- @unittest.skipIf(hasattr(sys, 'gettrace') and sys.gettrace(),
- 'fatal error if run with a trace function')
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
# recursion count when executing the test being low enough so as to
# trigger the recursion recovery detection in the _Py_MakeEndRecCheck