From: Brett Cannon <brett@python.org>
Date: Fri, 3 May 2013 14:56:19 +0000 (-0400)
Subject: Move test_imp over to unittest.main()
X-Git-Tag: v3.4.0a1~813
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=142685337f2eab63ac85d2e9a284a5eb900cd053;p=python

Move test_imp over to unittest.main()
---

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index f9b87bb035..1cd7c8a02e 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -1,3 +1,7 @@
+try:
+    import _thread
+except ImportError:
+    _thread = None
 import imp
 import importlib
 import os
@@ -17,6 +21,7 @@ def requires_load_dynamic(meth):
                            'imp.load_dynamic() required')(meth)
 
 
+@unittest.skipIf(_thread is None, '_thread module is required')
 class LockTests(unittest.TestCase):
 
     """Very basic test of import lock functions."""
@@ -446,20 +451,5 @@ class NullImporterTests(unittest.TestCase):
             os.rmdir(name)
 
 
-def test_main():
-    tests = [
-        ImportTests,
-        PEP3147Tests,
-        ReloadTests,
-        NullImporterTests,
-        ]
-    try:
-        import _thread
-    except ImportError:
-        pass
-    else:
-        tests.append(LockTests)
-    support.run_unittest(*tests)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
\ No newline at end of file