Merge lp:~gmb/launchpad/zope.testing-p16 into lp:launchpad

Proposed by Graham Binns
Status: Merged
Approved by: Graham Binns
Approved revision: no longer in the source branch.
Merged at revision: 15559
Proposed branch: lp:~gmb/launchpad/zope.testing-p16
Merge into: lp:launchpad
Diff against target: 17 lines (+3/-1)
1 file modified
versions.cfg (+3/-1)
To merge this branch: bzr merge lp:~gmb/launchpad/zope.testing-p16
Reviewer Review Type Date Requested Status
Graham Binns (community) code Approve
Review via email: mp+113011@code.launchpad.net

Commit message

Update Launchpad's dependency on our zope.testing fork to patch 17, which fixes test skipping when running under Python 2.7. Previously, skipping a test under Python 2.7 was basically a no-op, which caused the subunit stream to become corrupted.

Description of the change

This branch updates our zope.testing dependency to p16 of our fork, which fixes problems related to skips when running under Python 2.7.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) wrote :

Self reviewing since it's a nice quick change.

review: Approve (code)

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-07-03 20:10:53 +0000
3+++ versions.cfg 2012-07-05 14:46:23 +0000
4@@ -315,10 +315,12 @@
5 # raise an error and quit.
6 # p14 Adds test data written to stderr and stdout into the subunit output.
7 # p15 Fixed internal tests.
8+# p16 Adds support for skips in Python 2.7.
9+# p17 Fixes skip support for Python 2.6.
10 # To build (use Python 2.6) run "python bootstrap.py; ./bin/buildout". Then to
11 # build the distribution run "bin/buildout setup . sdist"
12 # Make sure you have subunit installed.
13-zope.testing = 3.9.4-p15
14+zope.testing = 3.9.4-p17
15 zope.thread = 3.4
16 zope.traversing = 3.8.0
17 zope.viewlet = 3.6.1