(original) (raw)

changeset: 88055:460961e80e31 user: Nick Coghlan ncoghlan@gmail.com date: Thu Dec 19 21:53:31 2013 +1000 files: Lib/test/test_multiprocessing_main_handling.py description: Issue #19946: appropriately skip new multiprocessing tests Thanks to Christian Heimes for noting the buildbot failures and to Zachary Ware for providing the patch to make the new tests play nice with both other platforms and unittest test discovery diff -r 45bd58a15bb9 -r 460961e80e31 Lib/test/test_multiprocessing_main_handling.py --- a/Lib/test/test_multiprocessing_main_handling.py Thu Dec 19 11:51:19 2013 +0000 +++ b/Lib/test/test_multiprocessing_main_handling.py Thu Dec 19 21:53:31 2013 +1000 @@ -130,10 +130,9 @@ class MultiProcessingCmdLineMixin(): maxDiff = None # Show full tracebacks on subprocess failure - def setupClass(cls): - if cls.start_method not in _concrete_contexts: - raise unittest.SkipTest("%r start method not available" % - cls.start_method) + def setUp(self): + if self.start_method not in _concrete_contexts: + self.skipTest("%r start method not available" % self.start_method) def _check_output(self, script_name, exit_code, out, err): if verbose > 1: @@ -277,11 +276,8 @@ start_method = 'forkserver' main_in_children_source = test_source_main_skipped_in_children -def test_main(): - support.run_unittest(SpawnCmdLineTest, - ForkCmdLineTest, - ForkServerCmdLineTest) +def tearDownModule(): support.reap_children() if __name__ == '__main__': - test_main() + unittest.main() /ncoghlan@gmail.com