From 142685337f2eab63ac85d2e9a284a5eb900cd053 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 3 May 2013 10:56:19 -0400
Subject: Move test_imp over to unittest.main()

---
 Lib/test/test_imp.py | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index f9b87bb..1cd7c8a 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
-- 
cgit v0.12