From c12f09ed24db31f0fc0b58010cb3da9e3107e06c Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Mon, 11 Nov 2013 22:47:04 -0600 Subject: Issue #19440: Clean up test_capi --- Lib/test/test_capi.py | 20 +++++++------------- Misc/NEWS | 4 ++++ 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index f1ea5a9..9013a7b 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -1,7 +1,6 @@ # Run the _testcapi module tests (tests for the Python/C API): by defn, # these are all functions _testcapi exports whose name begins with 'test_'. -from __future__ import with_statement import os import pickle import random @@ -351,17 +350,12 @@ class TestThreadState(unittest.TestCase): t.start() t.join() - -def test_main(): - support.run_unittest(CAPITest, TestPendingCalls, Test6012, - EmbeddingTest, SkipitemTest, TestThreadState) - - for name in dir(_testcapi): - if name.startswith('test_'): - test = getattr(_testcapi, name) - if support.verbose: - print("internal", name) - test() +class Test_testcapi(unittest.TestCase): + def test__testcapi(self): + for name in dir(_testcapi): + if name.startswith('test_'): + test = getattr(_testcapi, name) + test() if __name__ == "__main__": - test_main() + unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS index 9abddbb..b09f4d1 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -42,6 +42,10 @@ Library Tests ----- +- Issue #19440: Clean up test_capi by removing an unnecessary __future__ + import, converting from test_main to unittest.main, and running the + _testcapi module tests within a unittest TestCase. + - Issue #18702: All skipped tests now reported as skipped. - Issue #19085: Added basic tests for all tkinter widget options. -- cgit v0.12