From: Ned Deily <nad@acm.org>
Date: Sat, 9 Apr 2011 19:47:12 +0000 (-0700)
Subject: Issue #9670: merge with current
X-Git-Tag: v3.3.0a1~2637
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e678b439598b67266e6d5fcb56858a61335bff2;p=thirdparty%2FPython%2Fcpython.git

Issue #9670: merge with current
---

6e678b439598b67266e6d5fcb56858a61335bff2
diff --cc Lib/test/test_threading.py
index c107652d268f,32f9e99c4bd9..270e0b86e499
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@@ -685,10 -677,36 +685,40 @@@ class ThreadingExceptionTests(BaseTestC
          thread.start()
          self.assertRaises(RuntimeError, setattr, thread, "daemon", True)
  
 +    def test_releasing_unacquired_lock(self):
 +        lock = threading.Lock()
 +        self.assertRaises(RuntimeError, lock.release)
 +
+     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)