Launchpad itself

Merge ~cjwatson/launchpad:bump-keyserver-test-timeout into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. bump-keyserver-test-timeout
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: d4df6b09b9bce88e3b5e029b2c4805166030b625
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:bump-keyserver-test-timeout
Merge into: launchpad:master
Diff against target: 13 lines (+1/-1)
1 file modified
lib/lp/testing/keyserver/tests/test_web.py (+1/-1)
Reviewer Review Type Date Requested Status
Andrey Fedoseev (community) Approve
Review via email: mp+431123@code.launchpad.net

Commit message

Bump keyserver TestWebResources timeout to 30 seconds

Description of the change

The previous timeout of 2 seconds was not very robust in practice: scheduling blips in parallel test runs could easily cause tests to exceed that.

To post a comment you must log in.
Revision history for this message
Andrey Fedoseev (andrey-fedoseev) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/testing/keyserver/tests/test_web.py b/lib/lp/testing/keyserver/tests/test_web.py
2index c493f01..9a24613 100644
3--- a/lib/lp/testing/keyserver/tests/test_web.py
4+++ b/lib/lp/testing/keyserver/tests/test_web.py
5@@ -27,7 +27,7 @@ class RegularCallbackExecuted(Exception):
6
7 class TestWebResources(TestCase):
8
9- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=2)
10+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
11
12 def setUpKeysDirectory(self):
13 path = self.makeTemporaryDirectory()

Subscribers

People subscribed via source and target branches

to status/vote changes: