summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-04-09 19:32:12 (GMT)
committerNed Deily <nad@acm.org>2011-04-09 19:32:12 (GMT)
commit517ac72b00f34ce6fc00ea79997d5bf9464401b1 (patch)
tree860d5f1eb22f1d80e3af4e1d43e4c0d30e5aedaf /Lib
parente620d1070192ef85f2520e9f60cdbde2adb4d465 (diff)
downloadcpython-517ac72b00f34ce6fc00ea79997d5bf9464401b1.zip
cpython-517ac72b00f34ce6fc00ea79997d5bf9464401b1.tar.gz
cpython-517ac72b00f34ce6fc00ea79997d5bf9464401b1.tar.bz2
Issue #9670: Increase the default stack size for secondary threads on
Mac OS X and FreeBSD to reduce the chances of a crash instead of a "maximum recursion depth" RuntimeError exception. (Patch by Ronald Oussoren)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_threading.py30
1 files changed, 30 insertions, 0 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index f977a7f..75235ad 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -650,6 +650,36 @@ class ThreadingExceptionTests(unittest.TestCase):
thread.start()
self.assertRaises(RuntimeError, setattr, thread, "daemon", True)
+ def test_recursion_limit(self):
+ # Issue 9670
+ # test that excessive recursion within a non-main thread causes
+ # an exception rather than crashing the interpreter on platforms
+ # like Mac OS X or FreeBSD which have small default stack sizes
+ # for threads
+ script = """if True:
+ import threading
+
+ def recurse():
+ return recurse()
+
+ def outer():
+ try:
+ recurse()
+ except RuntimeError:
+ pass
+
+ w = threading.Thread(target=outer)
+ w.start()
+ w.join()
+ print('end of main thread')
+ """
+ expected_output = "end of main thread\n"
+ p = subprocess.Popen([sys.executable, "-c", script],
+ stdout=subprocess.PIPE)
+ stdout, stderr = p.communicate()
+ data = stdout.decode().replace('\r', '')
+ self.assertEqual(p.returncode, 0, "Unexpected error")
+ self.assertEqual(data, expected_output)
class LockTests(lock_tests.LockTests):
locktype = staticmethod(threading.Lock)