Launchpad itself

Merge lp:~mars/launchpad/use-zope.testing-3.9.4-p1 into lp:launchpad

  1. use-zope.testing-3.9.4-p1
  2. Merge into devel
Proposed by Māris Fogels
Status: Merged
Approved by: Māris Fogels
Approved revision: no longer in the source branch.
Merged at revision: 10991
Proposed branch: lp:~mars/launchpad/use-zope.testing-3.9.4-p1
Merge into: lp:launchpad
Diff against target: 14 lines (+2/-2)
1 file modified
versions.cfg (+2/-2)
To merge this branch: bzr merge lp:~mars/launchpad/use-zope.testing-3.9.4-p1
Reviewer Review Type Date Requested Status
Michael Nelson (community) code Approve
Review via email: mp+27265@code.launchpad.net

Commit message

Update to zope.testing-3.9.4-p1. Fixes bug 587886.

Description of the change

Hi,

This branch moves us onto a new post-release version of zope.testing-3.9.4. This fixes a problem where the testrunner would crash when printing doctest exceptions. The patch was backported from https://code.edge.launchpad.net/~mars/zope.testing/fix-subunit-utf8-traceback-reporting/+merge/27086. See bug 587886 for details.

Test command: bin/ec2 test
Lint: none
Pre-implementation with: gary_poster

Maris

To post a comment you must log in.
Revision history for this message
Michael Nelson (michael.nelson) wrote :

Thanks Maris.

Is it possible with this kind of change to have ec2 run the tests with both 2.5 and 2.6? Is that even necessary?

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

This change is really no more or less likely to break 2.6 than a code change in LP itself--though I grant you, if this failed in 2.6 the failure might be more spectacular than usual. :-)

I think running some representative tests on a local developers' Lucid machine should be enough of a failsafe for now.

In terms of automated tests, at this instant we are trying to test 2.6 with the buildbot bzr builder. Not ideal, but something. EC2 changes will come later this cycle as it becomes more and more certain that we will be able to meet our goal of switching to Lucid in the DC this time around.

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 2010-06-04 16:56:17 +0000
3+++ versions.cfg 2010-06-10 13:22:31 +0000
4@@ -214,8 +214,8 @@
5 zope.tal = 3.5.1
6 zope.tales = 3.4.0
7 zope.testbrowser = 3.7.0a1
8-# Build of lp:~mars/zope.testing/3.9.4-p0. Fixes bug 570380.
9-zope.testing = 3.9.4-p0
10+# Build of lp:~mars/zope.testing/3.9.4-p1. Fixes bugs 570380 and 587886.
11+zope.testing = 3.9.4-p1
12 zope.thread = 3.4
13 zope.traversing = 3.8.0
14 zope.viewlet = 3.6.1