Merge lp:~wallyworld/launchpad/windmill-1.3r1544 into lp:launchpad

Proposed by Ian Booth on 2010-10-01
Status: Merged
Approved by: Tim Penhey on 2010-10-01
Approved revision: no longer in the source branch.
Merged at revision: 11684
Proposed branch: lp:~wallyworld/launchpad/windmill-1.3r1544
Merge into: lp:launchpad
Diff against target: 19 lines (+5/-4)
1 file modified
versions.cfg (+5/-4)
To merge this branch: bzr merge lp:~wallyworld/launchpad/windmill-1.3r1544
Reviewer Review Type Date Requested Status
Tim Penhey (community) 2010-10-01 Approve on 2010-10-01
Review via email: mp+37209@code.launchpad.net

Commit Message

Upgrade windmill from r1440 to r1544 to fix an issue preventing some new launchpad tests from running

Description of the Change

See bug 652626

The version of windmill packaged with launchpad, currently 1.3r1440, has a bug which prevents some newly written windmill tests from running. The windmill bug results in code like the following:

client.asserts.assertProperty(id=u"field.review_type", validator='disabled|false')

failing with an array index error.

The windmill trunk has already been updated to fix this bug. A new windmill package has been built from the tip revision of the windmill trunk (r1544). The package is windmill-1.3r1544.tar.gz.

Implementation

  This branch updates the buildout config so the new windmill package is used.

Tests

  The tests from branch lp:~wallyworld/launchpad/reviews-without-reviewer which failed with the older version of
  windmill were re-run and they now pass.

  bin/test -vvt TestRequestReview

  A selection of other windmill tests were also run - regression testing.

To post a comment you must log in.
Tim Penhey (thumper) wrote :

Does the new r1544 package have the changes that were in Bjorn's branch?

Ian Booth (wallyworld) wrote :

Yes. I checked it out and his changes actually got pushed to the
windmill trunk on github. And of course the lp mirror I pulled from to
build the egg has the changes also since the mirrored branch location
was corrected. So no need to merge anything.

On 01/10/10 12:55, Tim Penhey wrote:
> Does the new r1544 package have the changes that were in Bjorn's branch?

Tim Penhey (thumper) wrote :

Awesome

review: Approve

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-09-18 08:00:27 +0000
3+++ versions.cfg 2010-10-01 02:38:54 +0000
4@@ -76,10 +76,11 @@
5 van.testing = 2.0.1
6 wadllib = 1.1.5
7 webunit = 1.3.8
8-# r1440 of lp:~bjornt/windmill/1.3-lp. It includes our patches to make test
9-# setup and tear down more robust, which didn't make it into the 1.3 release.
10-# Windmill 1.5 will include our patches.
11-windmill = 1.3beta3-lp-r1440
12+# r1544 of lp:windmill (the tip revision at the time of packaging).
13+# We need to use this revison rather than the official 1.3 release since
14+# there is a bug fix for WindmillTestClient.asserts.assertProperty() which
15+# makes this api call work property on html disabled and readonly attributes.
16+windmill = 1.3r1544
17 wsgi-fileserver = 0.2.7
18 wsgi-intercept = 0.4
19 wsgi-jsonrpc = 0.2.8