Merge lp:~bac/launchpad/bug-987444 into lp:launchpad

Proposed by Brad Crittenden on 2012-05-15
Status: Merged
Approved by: Brad Crittenden on 2012-05-15
Approved revision: no longer in the source branch.
Merged at revision: 15255
Proposed branch: lp:~bac/launchpad/bug-987444
Merge into: lp:launchpad
Diff against target: 12 lines (+1/-1)
1 file modified
versions.cfg (+1/-1)
To merge this branch: bzr merge lp:~bac/launchpad/bug-987444
Reviewer Review Type Date Requested Status
Benji York (community) code 2012-05-15 Approve on 2012-05-15
Review via email: mp+105862@code.launchpad.net

Commit Message

Use rabbitfixture 0.3.3.

Description of the Change

= Summary =

Rarely we see the Rabbit MQ layer not start when doing parallel
testing. Looking at the rabbitfixture code I see a change made by
Martin Pool a while back that has not been released. That fix
*should* solve this spurious failure.

Martin's fix is here:
https://code.launchpad.net/~mbp/rabbitfixture/rabbit-startup/+merge/80285

Looking at line 13 of his diff you see he changes the call from
check_running() to is_running(). The former actually raises an
exception if the server is not running, which is not what is wanted in
the loop where we wait for it to come up.

== Proposed fix ==

Create version 0.3.3 of rabbitfixture which included the desired
change plus another that is innocuous. Release rabbitfixture by
creating a new milestone on Launchpad, uploading a release tarball as
a download file, and pushing the new release to PyPI.

Change Launchpad to use the new version.

== Demo and Q/A ==

None

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  versions.cfg

To post a comment you must log in.
Benji York (benji) wrote :

This is the best one character change I've seen all day.

review: Approve (code)
Brad Crittenden (bac) wrote :

:)

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-05-11 14:39:57 +0000
3+++ versions.cfg 2012-05-15 17:58:20 +0000
4@@ -99,7 +99,7 @@
5 pytz = 2012c
6 rdflib = 3.1.0
7 RestrictedPython = 3.5.1
8-rabbitfixture = 0.3.2
9+rabbitfixture = 0.3.3
10 roman = 1.4.0
11 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
12 selenium = 2.0rc3-lp-distribute-fix