summaryrefslogtreecommitdiff
path: root/Lib/test
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-04-09 14:53:47 -0700
committerNed Deily <nad@acm.org>2011-04-09 14:53:47 -0700
commit2604e33f3002c48437df2f013a085197be8aba8d (patch)
tree4e7f49adee6015a274ced2d3b2a931ee0880ed93 /Lib/test
parent15012a67d25dbd1cee5e014be5f5f999c96c9c13 (diff)
parent45e47e58edf101e7865d4bdaa2261ce1421a4209 (diff)
downloadcpython-git-2604e33f3002c48437df2f013a085197be8aba8d.tar.gz
Issue9670: Merge backout to 3.2.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_threading.py30
1 files changed, 0 insertions, 30 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index 32f9e99c4b..5f99b2ea9f 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -677,36 +677,6 @@ class ThreadingExceptionTests(BaseTestCase):
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)