changeset: 84661:c704735487ae parent: 84657:7272ef213b7c parent: 84660:8a922b28b97d user: Richard Oudkerk date: Tue Jul 16 15:57:16 2013 +0100 files: Lib/test/test_multiprocessing.py Misc/NEWS description: Issue #17778: Fix test discovery for test_multiprocessing. (Patch by Zachary Ware.) diff -r 7272ef213b7c -r c704735487ae Lib/test/test_multiprocessing.py --- a/Lib/test/test_multiprocessing.py Tue Jul 16 08:32:05 2013 +0200 +++ b/Lib/test/test_multiprocessing.py Tue Jul 16 15:57:16 2013 +0100 @@ -2404,7 +2404,7 @@ c.close() l.close() -class _TestPoll(unittest.TestCase): +class _TestPoll(BaseTestCase): ALLOWED_TYPES = ('processes', 'threads') @@ -3585,16 +3585,7 @@ # # -testcases_other = [OtherTest, TestInvalidHandle, TestInitializers, - TestStdinBadfiledescriptor, TestWait, TestInvalidFamily, - TestFlags, TestTimeouts, TestNoForkBomb, - TestForkAwareThreadLock, TestIgnoreEINTR] - -# -# -# - -def test_main(run=None): +def setUpModule(): if sys.platform.startswith("linux"): try: lock = multiprocessing.RLock() @@ -3603,26 +3594,10 @@ check_enough_semaphores() - if run is None: - from test.support import run_unittest as run - util.get_temp_dir() # creates temp directory for use by all processes multiprocessing.get_logger().setLevel(LOG_LEVEL) - testcases = ( - sorted(testcases_processes.values(), key=lambda tc:tc.__name__) + - sorted(testcases_threads.values(), key=lambda tc:tc.__name__) + - sorted(testcases_manager.values(), key=lambda tc:tc.__name__) + - testcases_other - ) - - loadTestsFromTestCase = unittest.defaultTestLoader.loadTestsFromTestCase - suite = unittest.TestSuite(loadTestsFromTestCase(tc) for tc in testcases) - run(suite) - -def main(): - test_main(unittest.TextTestRunner(verbosity=2).run) if __name__ == '__main__': - main() + unittest.main() diff -r 7272ef213b7c -r c704735487ae Misc/NEWS --- a/Misc/NEWS Tue Jul 16 08:32:05 2013 +0200 +++ b/Misc/NEWS Tue Jul 16 15:57:16 2013 +0100 @@ -156,9 +156,13 @@ Library ------- -- Issue #18393: The private module _gestalt and private functions platform._mac_ver_gestalt, - platform._mac_ver_lookup and platform._bcd2str have been removed. This does not - affect the public interface of the platform module. +- Issue #17778: Fix test discovery for test_multiprocessing. (Patch by + Zachary Ware.) + +- Issue #18393: The private module _gestalt and private functions + platform._mac_ver_gestalt, platform._mac_ver_lookup and + platform._bcd2str have been removed. This does not affect the public + interface of the platform module. - Issue #17482: functools.update_wrapper (and functools.wraps) now set the __wrapped__ attribute correctly even if the underlying function has a