Launchpad itself

Merge lp:~bjornt/launchpad/windmill-1.3beta into lp:launchpad

  1. windmill-1.3beta
  2. Merge into devel
Proposed by Björn Tillenius
Status: Merged
Approved by: Brad Crittenden
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~bjornt/launchpad/windmill-1.3beta
Merge into: lp:launchpad
Diff against target: 37 lines
2 files modified
lib/lp/code/windmill/tests/test_branch_links.py (+2/-2)
versions.cfg (+4/-1)
To merge this branch: bzr merge lp:~bjornt/launchpad/windmill-1.3beta
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+12601@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Upgrade Windmill 1.3beta3 + our patches to make test setup and teardown
less fragile.

We upgrade to a beta release, since it's quite final, and it's good to
upgrade before people start converting tests to the new format. That way
people can make sure that tests still pass with 1.3.

I've fixed the Code Windmill to pass with 1.3, since a validator got
fixed to match the exact string.

--
Björn Tillenius | https://launchpad.net/~bjornt

Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/windmill/tests/test_branch_links.py'
2--- lib/lp/code/windmill/tests/test_branch_links.py 2009-09-15 09:14:25 +0000
3+++ lib/lp/code/windmill/tests/test_branch_links.py 2009-09-29 17:31:17 +0000
4@@ -38,7 +38,7 @@
5
6 client.waits.forElement(id=u'buglink-1', timeout=u'10000')
7 client.asserts.assertText(id=u'linkbug',
8- validator=u'Link to another bug')
9+ validator=u'Link to another bug report')
10
11 client.click(id=u'linkbug')
12 client.waits.forElement(id=u'field.bug')
13@@ -47,7 +47,7 @@
14
15 client.waits.forElement(id=u'buglink-1', timeout=u'10000')
16 client.asserts.assertText(id=u'linkbug',
17- validator=u'Link to another bug')
18+ validator=u'Link to another bug report')
19
20 # And now to unlink.
21 client.click(id=u'delete-buglink-1')
22
23=== modified file 'versions.cfg'
24--- versions.cfg 2009-09-22 21:14:32 +0000
25+++ versions.cfg 2009-09-29 17:31:17 +0000
26@@ -48,7 +48,10 @@
27 van.testing = 2.0.1
28 wadllib = 1.1.3
29 webunit = 1.3.8
30-windmill = 1.2
31+# r1440 of lp:~bjornt/windmill/1.3-lp. It includes our patches to make test
32+# setup and tear down more robust, which didn't make it into the 1.3 release.
33+# Windmill 1.5 will include our patches.
34+windmill = 1.3beta3-lp-r1440
35 wsgi-fileserver = 0.2.7
36 wsgi-intercept = 0.4
37 wsgi-jsonrpc = 0.2.8