Merge lp:~lifeless/launchpad/threads into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Michael Hudson-Doyle |
Approved revision: | no longer in the source branch. |
Merged at revision: | 11775 |
Proposed branch: | lp:~lifeless/launchpad/threads |
Merge into: | lp:launchpad |
Diff against target: |
46 lines (+4/-6) 3 files modified
lib/canonical/testing/layers.py (+1/-0) lib/canonical/testing/tests/test_layers.py (+0/-5) versions.cfg (+3/-1) |
To merge this branch: | bzr merge lp:~lifeless/launchpad/threads |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michael Hudson-Doyle | Approve | ||
Review via email: mp+39009@code.launchpad.net |
Description of the change
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-
--- zope.testing-
+++ zope.testing-
@@ -1048,8 +1048,11 @@ class SubunitOutputFo
"""
- self._subunit.
- test, details=
+ # 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.
+ test, details=
def refcounts(self, rc, prev):
"""Report a change in reference counts."""
woo