summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-01 08:56:35 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-01 08:56:35 (GMT)
commit6cc46d35f1335e513238ba831df9d82ddc81b9d9 (patch)
treead39fabd5814ec627d124cef938b2f5421179716 /Lib/test
parenta2f94aa0bf6d4acfba188ca2493d4ecffb30eab4 (diff)
parent520378f81d30105d421e7b3a53c30fb0346be269 (diff)
downloadcpython-6cc46d35f1335e513238ba831df9d82ddc81b9d9.zip
cpython-6cc46d35f1335e513238ba831df9d82ddc81b9d9.tar.gz
cpython-6cc46d35f1335e513238ba831df9d82ddc81b9d9.tar.bz2
#17079: merge with 3.3.
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_ctypes.py8
1 files changed, 4 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()