launchpad-reviewers team mailing list archive

[Colin Watson <mp+420138@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:rabbit-service-config-test-timeout into launchpad:master.

Commit message:
Bump timeout in TestRabbitServer.test_service_config to 60 seconds

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/420138

`RabbitMQLayer` already did this to allow for contention on buildbot.  This test starts its own server without using that layer, so it needs to do the same thing for the same reason.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:rabbit-service-config-test-timeout into launchpad:master.

diff --git a/lib/lp/services/rabbit/tests/test_server.py b/lib/lp/services/rabbit/tests/test_server.py
index 59bd1c5..f00755f 100644
--- a/lib/lp/services/rabbit/tests/test_server.py
+++ b/lib/lp/services/rabbit/tests/test_server.py
@@ -23,8 +23,10 @@ class TestRabbitServer(TestCase):
         # tests fail to cleanup.
         self.useFixture(EnvironmentVariableFixture('HOME', '/nonsense/value'))
 
+        # The default timeout is 15 seconds, but increase this a bit to
+        # allow some more leeway for slow test environments.
+        fixture = self.useFixture(RabbitServer(ctltimeout=60))
         # RabbitServer pokes some .ini configuration into its config.
-        fixture = self.useFixture(RabbitServer())
         service_config = ConfigParser()
         service_config.read_file(io.StringIO(fixture.config.service_config))
         self.assertEqual(["rabbitmq"], service_config.sections())