launchpad-reviewers team mailing list archive

[Robert Collins <robertc@xxxxxxxxxxxxxxxxx>]

Robert Collins has proposed merging lp:~lifeless/launchpad/threads into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #663644 thread-leak checking logic disable flag not working
  https://bugs.launchpad.net/bugs/663644


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."""
-- 
https://code.launchpad.net/~lifeless/launchpad/threads/+merge/39009
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lifeless/launchpad/threads into lp:launchpad/devel.

=== modified file 'versions.cfg'
--- versions.cfg	2010-10-18 15:11:17 +0000
+++ versions.cfg	2010-10-21 02:21:10 +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