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
=== modified file 'lib/lp/code/windmill/tests/test_branch_links.py'
--- lib/lp/code/windmill/tests/test_branch_links.py 2009-09-15 09:14:25 +0000
+++ lib/lp/code/windmill/tests/test_branch_links.py 2009-09-29 17:31:17 +0000
@@ -38,7 +38,7 @@
3838
39 client.waits.forElement(id=u'buglink-1', timeout=u'10000')39 client.waits.forElement(id=u'buglink-1', timeout=u'10000')
40 client.asserts.assertText(id=u'linkbug',40 client.asserts.assertText(id=u'linkbug',
41 validator=u'Link to another bug')41 validator=u'Link to another bug report')
4242
43 client.click(id=u'linkbug')43 client.click(id=u'linkbug')
44 client.waits.forElement(id=u'field.bug')44 client.waits.forElement(id=u'field.bug')
@@ -47,7 +47,7 @@
4747
48 client.waits.forElement(id=u'buglink-1', timeout=u'10000')48 client.waits.forElement(id=u'buglink-1', timeout=u'10000')
49 client.asserts.assertText(id=u'linkbug',49 client.asserts.assertText(id=u'linkbug',
50 validator=u'Link to another bug')50 validator=u'Link to another bug report')
5151
52 # And now to unlink.52 # And now to unlink.
53 client.click(id=u'delete-buglink-1')53 client.click(id=u'delete-buglink-1')
5454
=== modified file 'versions.cfg'
--- versions.cfg 2009-09-22 21:14:32 +0000
+++ versions.cfg 2009-09-29 17:31:17 +0000
@@ -48,7 +48,10 @@
48van.testing = 2.0.148van.testing = 2.0.1
49wadllib = 1.1.349wadllib = 1.1.3
50webunit = 1.3.850webunit = 1.3.8
51windmill = 1.251# r1440 of lp:~bjornt/windmill/1.3-lp. It includes our patches to make test
52# setup and tear down more robust, which didn't make it into the 1.3 release.
53# Windmill 1.5 will include our patches.
54windmill = 1.3beta3-lp-r1440
52wsgi-fileserver = 0.2.755wsgi-fileserver = 0.2.7
53wsgi-intercept = 0.456wsgi-intercept = 0.4
54wsgi-jsonrpc = 0.2.857wsgi-jsonrpc = 0.2.8