summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-01 08:55:17 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-01 08:55:17 (GMT)
commit520378f81d30105d421e7b3a53c30fb0346be269 (patch)
treee1b9a92e4a5b5e8161eca76d311251baa3c6bce3
parent4b231a7d125a645f930252086682b5c1151edd8a (diff)
downloadcpython-520378f81d30105d421e7b3a53c30fb0346be269.zip
cpython-520378f81d30105d421e7b3a53c30fb0346be269.tar.gz
cpython-520378f81d30105d421e7b3a53c30fb0346be269.tar.bz2
#17079: test_ctypes now works with unittest test discovery. Patch by Zachary Ware.
-rw-r--r--Lib/test/test_ctypes.py8
-rw-r--r--Misc/NEWS3
2 files changed, 7 insertions, 4 deletions
diff --git a/Lib/test/test_ctypes.py b/Lib/test/test_ctypes.py
index 7d9abdc..496355e 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 043daee..3149f90 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.