From: Ezio Melotti <ezio.melotti@gmail.com>
Date: Fri, 1 Mar 2013 08:55:17 +0000 (+0200)
Subject: #17079: test_ctypes now works with unittest test discovery.  Patch by Zachary Ware.
X-Git-Tag: v3.3.1rc1~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=520378f81d30105d421e7b3a53c30fb0346be269;p=thirdparty%2FPython%2Fcpython.git

#17079: test_ctypes now works with unittest test discovery.  Patch by Zachary Ware.
---

diff --git a/Lib/test/test_ctypes.py b/Lib/test/test_ctypes.py
index 7d9abdcba722..496355e61d34 100644
--- a/Lib/test/test_ctypes.py
+++ b/Lib/test/test_ctypes.py
@@ -1,16 +1,16 @@
 import unittest
 
-from test.support import run_unittest, import_module
+from test.support import import_module
 
 # Skip tests if _ctypes module was not built.
 import_module('_ctypes')
 
 import ctypes.test
 
-def test_main():
+def load_tests(*args):
     skipped, testcases = ctypes.test.get_tests(ctypes.test, "test_*.py", verbosity=0)
     suites = [unittest.makeSuite(t) for t in testcases]
-    run_unittest(unittest.TestSuite(suites))
+    return unittest.TestSuite(suites)
 
 if __name__ == "__main__":
-    test_main()
+    unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
index 043daee7e76b..3149f9085224 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -644,6 +644,9 @@ Tests
 
 - Issue #15539: Added regression tests for Tools/scripts/pindent.py.
 
+- Issue #17079: test_ctypes now works with unittest test discovery.
+  Patch by Zachary Ware.
+
 - Issue #17304: test_hash now works with unittest test discovery.
   Patch by Zachary Ware.