test_packaging should clean up after itself (but it doesn't really)

diff --git a/Lib/packaging/tests/__main__.py b/Lib/packaging/tests/__main__.py
index 68ee229e5ad7714ae8fd66a2f2b0cf81084968ca..0f175cf96109d372a05aa3a9808756f1b8c21b1a 100644 (file)
--- a/Lib/packaging/tests/__main__.py
+++ b/Lib/packaging/tests/__main__.py
@@ -5,15 +5,18 @@
 import os
 import sys
 import unittest
-from test.support import run_unittest, reap_children
+from test.support import run_unittest, reap_children, reap_threads
 
 
+@reap_threads
 def test_main():
-    start_dir = os.path.dirname(__file__)
-    top_dir = os.path.dirname(os.path.dirname(start_dir))
-    test_loader = unittest.TestLoader()
-    run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
-    reap_children()
+    try:
+        start_dir = os.path.dirname(__file__)
+        top_dir = os.path.dirname(os.path.dirname(start_dir))
+        test_loader = unittest.TestLoader()
+        run_unittest(test_loader.discover(start_dir, top_level_dir=top_dir))
+    finally:
+        reap_children()
 
 
 if __name__ == '__main__':