Merge lp:~lifeless/launchpad/threads into lp:launchpad

[Robert Collins]

Stage two - we have hudson and ec2 that depend on subunit;

We can eventually filter the subunit stream but there isn't (yet) a tag based filter there, this will get us by in the interim. The zope change is:

diff -rup zope.testing-3.9.4-p1/src/zope/testing/testrunner/formatter.py zope.testing-3.9.4-p2/src/zope/testing/testrunner/formatter.py
--- zope.testing-3.9.4-p1/src/zope/testing/testrunner/formatter.py 2010-06-09 23:32:25.000000000 +1000
+++ zope.testing-3.9.4-p2/src/zope/testing/testrunner/formatter.py 2010-10-21 13:13:20.400452654 +1100
@@ -1048,8 +1048,11 @@ class SubunitOutputFormatter(object):
         """
         self._subunit.startTest(test)
         self._emit_tag(self.TAG_THREADS)
- self._subunit.addError(
- test, details=self._get_text_details('garbage', unicode(new_threads)))
+ # This is a skip because otherwise windmill errors make things break
+ # and its normal for threads to not complete exactly on test
+ # boundaries. We check for this in the LP testrunner baselayer anyway.
+ self._subunit.addSkip(
+ test, details=self._get_text_details('threads', unicode(new_threads)))

     def refcounts(self, rc, prev):
         """Report a change in reference counts."""

[Michael Hudson-Doyle (mwhudson)]

woo

review: Approve

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-10-20 03:59:21 +0000
+++ lib/canonical/testing/layers.py	2010-10-21 10:56:19 +0000
@@ -349,6 +349,7 @@
                     gc.collect()
                 else:
                     break
+            new_threads = new_live_threads()
 
         if new_threads:
             # BaseLayer.disable_thread_check is a mechanism to stop

=== modified file 'lib/canonical/testing/tests/test_layers.py'
--- lib/canonical/testing/tests/test_layers.py	2010-09-29 05:53:47 +0000
+++ lib/canonical/testing/tests/test_layers.py	2010-10-21 10:56:19 +0000
@@ -7,7 +7,6 @@
 __all__ = []
 
 import threading
-import unittest
 
 from canonical.testing.layers import (
     BaseLayer,
@@ -42,7 +41,3 @@
     def test_disabled_thread_check(self):
         # Confirm the BaseLayer.disable_thread_check code path works.
         BaseLayer.disable_thread_check = True
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'versions.cfg'
--- versions.cfg	2010-10-18 15:11:17 +0000
+++ versions.cfg	2010-10-21 10:56:19 +0000
@@ -231,7 +231,9 @@
 zope.tales = 3.4.0
 zope.testbrowser = 3.7.0a1
 # Build of lp:~mars/zope.testing/3.9.4-p1.  Fixes bugs 570380 and 587886.
-zope.testing = 3.9.4-p1
+# With patch for thread leaks to make them skips, fixes windmill errors with
+# 'new threads' in hudson/ec2 builds.
+zope.testing = 3.9.4-p2
 zope.thread = 3.4
 zope.traversing = 3.8.0
 zope.viewlet = 3.6.1