← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again into lp:launchpad

 

Francesco Banconi has proposed merging lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1002820 in Launchpad itself: "lp.testing.layers.RabbitMQLayer:setUp times out rarely/intermittently in parallel tests"
  https://bugs.launchpad.net/launchpad/+bug/1002820

For more details, see:
https://code.launchpad.net/~frankban/launchpad/bug-1002820-rabbitmq-timeout-again/+merge/110822

= Summary =

RabbitMQLayer:setUp still times out.

== Proposed fix ==

Rather than increasing the timeout again, this time I've changed the relevant code to use an established amount of retries while waiting for the server to be up. This way we ensure the connection is checked for X times, without relying on the wall clock.
The real diff can be found here: http://pastebin.ubuntu.com/1047312/

No QA.

-- 
https://code.launchpad.net/~frankban/launchpad/bug-1002820-rabbitmq-timeout-again/+merge/110822
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~frankban/launchpad/bug-1002820-rabbitmq-timeout-again into lp:launchpad.
=== modified file 'versions.cfg'
--- versions.cfg	2012-06-14 16:30:26 +0000
+++ versions.cfg	2012-06-18 13:51:22 +0000
@@ -104,8 +104,9 @@
 RestrictedPython = 3.5.1
 # lp-1 Build of lp:~benji/rabbitfixture/longer-timeout revision: r30
 # lp-2 Build of lp:~frankban/rabbitfixture/longer-timeout revision: r32
+# lp-3 Build of lp:~frankban/rabbitfixture/lp3 revision: r33
 # to build: python setup.py sdist
-rabbitfixture = 0.3.3-lp-2
+rabbitfixture = 0.3.3-lp-3
 roman = 1.4.0
 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
 selenium = 2.0rc3-lp-distribute-fix


Follow ups