Launchpad itself

Merge lp:~frankban/launchpad/bug-1002820-again-and-again into lp:launchpad

  1. bug-1002820-again-and-again
  2. Merge into devel
Proposed by Francesco Banconi on 2012-06-22
Status: Merged
Approved by: Francesco Banconi on 2012-06-22
Approved revision: no longer in the source branch.
Merged at revision: 15485
Proposed branch: lp:~frankban/launchpad/bug-1002820-again-and-again
Merge into: lp:launchpad
Diff against target: 14 lines (+2/-1)
1 file modified
versions.cfg (+2/-1)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-1002820-again-and-again
Reviewer Review Type Date Requested Status
Gary Poster (community) 2012-06-22 Approve on 2012-06-22
Review via email: mp+111608@code.launchpad.net

Commit Message

Add rabbitfixture 0.3.3-lp-4 and dependencies to the download cache

Description of the Change

= Summary =

RabbitMQLayer:setUp still times out.

== Proposed fix ==

Increased the number of retries, and used retries also in _stop (invoked by rabbot layer teardown).
The real diff is here: http://pastebin.ubuntu.com/1054367/

To post a comment you must log in.
Gary Poster (gary) wrote :

Heh, ok cool. If this doesn't work, we definitely need to go back to the drawing board. :-) Thank you!

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 2012-06-21 19:53:16 +0000
3+++ versions.cfg 2012-06-22 15:10:44 +0000
4@@ -105,8 +105,9 @@
5 # lp-1 Build of lp:~benji/rabbitfixture/longer-timeout revision: r30
6 # lp-2 Build of lp:~frankban/rabbitfixture/longer-timeout revision: r32
7 # lp-3 Build of lp:~frankban/rabbitfixture/lp3 revision: r33
8+# lp-4 Build of lp:~frankban/rabbitfixture/lp4 revision: r34
9 # to build: python setup.py sdist
10-rabbitfixture = 0.3.3-lp-3
11+rabbitfixture = 0.3.3-lp-4
12 roman = 1.4.0
13 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
14 selenium = 2.0rc3-lp-distribute-fix