Launchpad itself

Merge lp:~cjwatson/launchpad/rabbitfixture-0.4.2 into lp:launchpad

  1. rabbitfixture-0.4.2
  2. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 19041
Proposed branch: lp:~cjwatson/launchpad/rabbitfixture-0.4.2
Merge into: lp:launchpad
Diff against target: 26 lines (+4/-2)
2 files modified
constraints.txt (+1/-1)
lib/lp/testing/layers.py (+3/-1)
To merge this branch: bzr merge lp:~cjwatson/launchpad/rabbitfixture-0.4.2
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+371738@code.launchpad.net

Commit message

Upgrade to rabbitfixture 0.4.2 and bump ctltimeout to 60 seconds.

Description of the change

This should help with some transient buildbot failures.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'constraints.txt'
2--- constraints.txt 2019-08-22 14:23:29 +0000
3+++ constraints.txt 2019-08-23 11:46:50 +0000
4@@ -345,7 +345,7 @@
5 python-openid==2.2.5-fix1034376
6 python-swiftclient==2.0.3
7 PyYAML==3.10
8-rabbitfixture==0.4.1
9+rabbitfixture==0.4.2
10 requests==2.22.0
11 requests-file==1.4.3
12 requests-toolbelt==0.9.1
13
14=== modified file 'lib/lp/testing/layers.py'
15--- lib/lp/testing/layers.py 2019-05-22 14:57:45 +0000
16+++ lib/lp/testing/layers.py 2019-08-23 11:46:50 +0000
17@@ -676,7 +676,9 @@
18 class RabbitMQLayer(BaseLayer):
19 """Provides tests access to a rabbitMQ instance."""
20
21- rabbit = RabbitServer()
22+ # The default timeout is 15 seconds, but increase this a bit to allow
23+ # some more leeway for slow test environments.
24+ rabbit = RabbitServer(ctltimeout=60)
25
26 _is_setup = False
27