From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 15 Oct 2013 21:24:44 +0000 (+0200)
Subject: Issue #14407: Fix unittest test discovery in test_concurrent_futures.
X-Git-Tag: v3.4.0a4~97
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=355dda8d17c01d39fac47966aa6b6b44bf6e88b0;p=thirdparty%2FPython%2Fcpython.git

Issue #14407: Fix unittest test discovery in test_concurrent_futures.
---

355dda8d17c01d39fac47966aa6b6b44bf6e88b0
diff --cc Lib/test/test_concurrent_futures.py
index 4ad33091b0f1,39230e1cf096..a7e945cb5e9d
--- a/Lib/test/test_concurrent_futures.py
+++ b/Lib/test/test_concurrent_futures.py
@@@ -402,24 -396,8 +402,24 @@@ class ExecutorTest
          self.executor.map(str, [2] * (self.worker_count + 1))
          self.executor.shutdown()
  
 +    @test.support.cpython_only
 +    def test_no_stale_references(self):
 +        # Issue #16284: check that the executors don't unnecessarily hang onto
 +        # references.
 +        my_object = MyObject()
 +        my_object_collected = threading.Event()
 +        my_object_callback = weakref.ref(
 +            my_object, lambda obj: my_object_collected.set())
 +        # Deliberately discarding the future.
 +        self.executor.submit(my_object.my_method)
 +        del my_object
 +
 +        collected = my_object_collected.wait(timeout=5.0)
 +        self.assertTrue(collected,
 +                        "Stale reference not collected within timeout.")
 +
  
- class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest):
+ class ThreadPoolExecutorTest(ThreadPoolMixin, ExecutorTest, unittest.TestCase):
      def test_map_submits_without_iteration(self):
          """Tests verifying issue 11777."""
          finished = []
diff --cc Misc/NEWS
index 88c9bc38c1b2,7744958e3027..e5d92cd4ca55
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -113,44 -117,6 +113,46 @@@ Librar
  - Issue #4366: Fix building extensions on all platforms when --enable-shared
    is used.
  
 +Tests
 +-----
 +
++- Issue #14407: Fix unittest test discovery in test_concurrent_futures.
++
 +- Issue #18919: Unified and extended tests for audio modules: aifc, sunau and
 +  wave.
 +
 +- Issue #18714: Added tests for ``pdb.find_function()``.
 +
 +Documentation
 +-------------
 +
 +- Issue #18758: Fixed and improved cross-references.
 +
 +- Issue #18972: Modernize email examples and use the argparse module in them.
 +
 +Build
 +-----
 +
 +- Issue #19130: Correct PCbuild/readme.txt, Python 3.3 and 3.4 require VS 2010.
 +
 +
 +What's New in Python 3.4.0 Alpha 3?
 +===================================
 +
 +Release date: 2013-09-29
 +
 +
 +Core and Builtins
 +-----------------
 +
 +- Issue #18818: The "encodingname" part of PYTHONIOENCODING is now optional.
 +
 +- Issue #19098: Prevent overflow in the compiler when the recursion limit is set
 +  absurdly high.
 +
 +Library
 +-------
 +
  - Issue #18950: Fix miscellaneous bugs in the sunau module.
    Au_read.readframes() now updates current file position and reads correct
    number of frames from multichannel stream.  Au_write.writeframesraw() now