Launchpad itself

Merge lp:~frankban/launchpad/bug-1002820-rabbitfixture-longer-timeout into lp:launchpad

  1. bug-1002820-rabbitfixture-longer-timeout
  2. Merge into devel
Proposed by Francesco Banconi on 2012-06-08
Status: Merged
Approved by: Graham Binns on 2012-06-08
Approved revision: no longer in the source branch.
Merged at revision: 15382
Proposed branch: lp:~frankban/launchpad/bug-1002820-rabbitfixture-longer-timeout
Merge into: lp:launchpad
Diff against target: 17 lines (+3/-3)
1 file modified
versions.cfg (+3/-3)
To merge this branch: bzr merge lp:~frankban/launchpad/bug-1002820-rabbitfixture-longer-timeout
Reviewer Review Type Date Requested Status
Graham Binns (community) code 2012-06-08 Approve on 2012-06-08
Review via email: mp+109309@code.launchpad.net

Description of the Change

Increased timeouts in our rabbitfixture.
The rabbitfixture diff is here: http://pastebin.ubuntu.com/1028736/

This doubles the values already increased by Benji: see http://bazaar.launchpad.net/~benji/rabbitfixture/longer-timeout/revision/29#rabbitfixture/server.py

To post a comment you must log in.
Graham Binns (gmb) :
review: Approve (code)

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-23 22:40:28 +0000
3+++ versions.cfg 2012-06-08 08:36:22 +0000
4@@ -102,10 +102,10 @@
5 pytz = 2012c
6 rdflib = 3.1.0
7 RestrictedPython = 3.5.1
8-# Built from lp:~benji/rabbitfixture/longer-timeout
9-# revision: r30
10+# lp-1 Build of lp:~benji/rabbitfixture/longer-timeout revision: r30
11+# lp-2 Build of lp:~frankban/rabbitfixture/longer-timeout revision: r32
12 # to build: python setup.py sdist
13-rabbitfixture = 0.3.3-lp-1
14+rabbitfixture = 0.3.3-lp-2
15 roman = 1.4.0
16 # See http://code.google.com/p/selenium/issues/detail?id=1935 .
17 selenium = 2.0rc3-lp-distribute-fix