Issue #1722344: threading._shutdown() is now called in Py_Finalize(), which

fixes the problem of some exceptions being thrown at shutdown when the
interpreter is killed. Patch by Adam Olsen.

1 files changed, 24 insertions, 0 deletions

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index ba60d8a..6723d00 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -306,6 +306,30 @@ class ThreadTests(unittest.TestCase):
         self.assertFalse(rc == 2, "interpreted was blocked")
         self.assertTrue(rc == 0, "Unexpected error")
 
+    def test_join_nondaemon_on_shutdown(self):
+        # Issue 1722344
+        # Raising SystemExit skipped threading._shutdown
+        import subprocess
+        p = subprocess.Popen([sys.executable, "-c", """if 1:
+                import threading
+                from time import sleep
+
+                def child():
+                    sleep(1)
+                    # As a non-daemon thread we SHOULD wake up and nothing
+                    # should be torn down yet
+                    print "Woke up, sleep function is:", sleep
+
+                threading.Thread(target=child).start()
+                raise SystemExit
+            """],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE)
+        stdout, stderr = p.communicate()
+        self.assertEqual(stdout, "Woke up, sleep function is: <built-in function sleep>\n")
+        self.assertEqual(stderr, "")
+
+
 
     def test_enumerate_after_join(self):
         # Try hard to trigger #1703448: a thread is still returned in