cpython: 38243a0a1f44 (original) (raw)

--- a/Lib/test/test_concurrent_futures.py +++ b/Lib/test/test_concurrent_futures.py @@ -88,7 +88,7 @@ class ProcessPoolMixin(ExecutorMixin): executor_type = futures.ProcessPoolExecutor -class ExecutorShutdownTest(unittest.TestCase): +class ExecutorShutdownTest: def test_run_after_shutdown(self): self.executor.shutdown() self.assertRaises(RuntimeError, @@ -116,7 +116,7 @@ class ExecutorShutdownTest(unittest.Test f.result() -class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest): +class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, unittest.TestCase): def _prime_executor(self): pass @@ -148,7 +148,7 @@ class ThreadPoolShutdownTest(ThreadPoolM t.join() -class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest): +class ProcessPoolShutdownTest(ProcessPoolMixin, ExecutorShutdownTest, unittest.TestCase): def _prime_executor(self): pass @@ -184,7 +184,7 @@ class ProcessPoolShutdownTest(ProcessPoo p.join() -class WaitTests(unittest.TestCase): +class WaitTests: def test_first_completed(self): future1 = self.executor.submit(mul, 21, 2) @@ -285,7 +285,7 @@ class WaitTests(unittest.TestCase): self.assertEqual(set([future2]), pending) -class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests): +class ThreadPoolWaitTests(ThreadPoolMixin, WaitTests, unittest.TestCase): def test_pending_calls_race(self): # Issue #14406: multi-threaded race condition when waiting on all @@ -303,11 +303,11 @@ class ThreadPoolWaitTests(ThreadPoolMixi sys.setswitchinterval(oldswitchinterval) -class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests): +class ProcessPoolWaitTests(ProcessPoolMixin, WaitTests, unittest.TestCase): pass -class AsCompletedTests(unittest.TestCase): +class AsCompletedTests: # TODO(brian@sweetapp.com): Should have a test with a non-zero timeout. def test_no_timeout(self): future1 = self.executor.submit(mul, 2, 21) @@ -345,15 +345,15 @@ class AsCompletedTests(unittest.TestCase completed_futures) -class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests): +class ThreadPoolAsCompletedTests(ThreadPoolMixin, AsCompletedTests, unittest.TestCase): pass -class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests): +class ProcessPoolAsCompletedTests(ProcessPoolMixin, AsCompletedTests, unittest.TestCase): pass -class ExecutorTest(unittest.TestCase): +class ExecutorTest: # Executor.shutdown() and context manager usage is tested by # ExecutorShutdownTest. def test_submit(self): @@ -397,7 +397,7 @@ class ExecutorTest(unittest.TestCase): self.executor.shutdown() -class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest): +class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, unittest.TestCase): def test_map_submits_without_iteration(self): """Tests verifying issue 11777.""" finished = [] @@ -409,7 +409,7 @@ class ThreadPoolExecutorTest(ThreadPoolM self.assertCountEqual(finished, range(10)) -class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest): +class ProcessPoolExecutorTest(ProcessPoolMixin, ExecutorTest, unittest.TestCase): def test_killed_child(self): # When a child process is abruptly terminated, the whole pool gets # "broken". @@ -648,16 +648,7 @@ class FutureTests(unittest.TestCase): @test.support.reap_threads def test_main(): try:

•    test.support.run_unittest(ProcessPoolExecutorTest,[](#l1.103)

•                              ThreadPoolExecutorTest,[](#l1.104)

•                              ProcessPoolWaitTests,[](#l1.105)

•                              ThreadPoolWaitTests,[](#l1.106)

•                              ProcessPoolAsCompletedTests,[](#l1.107)

•                              ThreadPoolAsCompletedTests,[](#l1.108)

•                              FutureTests,[](#l1.109)

•                              ProcessPoolShutdownTest,[](#l1.110)

•                              ThreadPoolShutdownTest,[](#l1.111)

•                              )[](#l1.112)

•    test.support.run_unittest(__name__)[](#l1.113)

  finally: test.support.reap_children()

--- a/Misc/NEWS +++ b/Misc/NEWS @@ -430,6 +430,8 @@ IDLE Tests ----- +- Issue #14407: Fix unittest test discovery in test_concurrent_futures. +

• Issue #18919: Unified and extended tests for audio modules: aifc, sunau and wave.