Merge lp:~gary/launchpad/zope.testing into lp:launchpad

Proposed by Gary Poster
Status: Merged
Approved by: Gary Poster
Approved revision: not available
Merged at revision: 15058
Proposed branch: lp:~gary/launchpad/zope.testing
Merge into: lp:launchpad
Diff against target: 17 lines (+6/-1)
1 file modified
versions.cfg (+6/-1)
To merge this branch: bzr merge lp:~gary/launchpad/zope.testing
Reviewer Review Type Date Requested Status
Gary Poster (community) Approve
Review via email: mp+100705@code.launchpad.net

Commit message

Use new version of zope.testing that fixes ./bin/test --list --subunit

Description of the change

Use new version of zope.testing that fixes ./bin/test --list --subunit

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Self-approving

review: Approve
Revision history for this message
Gary Poster (gary) wrote :

This should not need qa. I'm sorry for not correctly marking the pqm submission.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'versions.cfg'
2--- versions.cfg 2012-03-30 18:13:38 +0000
3+++ versions.cfg 2012-04-03 22:17:21 +0000
4@@ -281,7 +281,12 @@
5 # p3 And always tear down layers, because thats the Right Thing To Do.
6 # p4 fixes --subunit --list to really just list the tests.
7 # p5 Build of lp:~launchpad/zope.testing/3.9.4-p5. Fixes bug #609986.
8-zope.testing = 3.9.4-p5
9+# p6 reinstates fix from p4. Build of lp:~launchpad/zope.testing/3.9.4-fork
10+# revision 26. To build, use python 2.6, not 2.7.
11+# Run "python bootstrap.py; ./bin/buildout".
12+# Make sure you have subunit installed. When running tests, be aware that
13+# three will fail initially, per http://pastebin.ubuntu.com/913757/ .
14+zope.testing = 3.9.4-p6
15 zope.thread = 3.4
16 zope.traversing = 3.8.0
17 zope.viewlet = 3.6.1