Launchpad itself

Merge ~cjwatson/launchpad:test-timeouts into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. test-timeouts
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 6cb03502096bcb522545b1954c0e4e754b9c3b3b
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:test-timeouts
Merge into: launchpad:master
Diff against target: 192 lines (+16/-16)
12 files modified
lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py (+1/-1)
lib/lp/archivepublisher/tests/test_customupload.py (+1/-1)
lib/lp/archivepublisher/tests/test_publisher.py (+1/-1)
lib/lp/archivepublisher/tests/test_signing.py (+1/-1)
lib/lp/buildmaster/tests/snapbuildproxy.py (+1/-1)
lib/lp/buildmaster/tests/test_interactor.py (+4/-4)
lib/lp/code/model/tests/test_recipebuilder.py (+1/-1)
lib/lp/services/librarianserver/tests/test_db.py (+1/-1)
lib/lp/services/twistedsupport/tests/test_processmonitor.py (+1/-1)
lib/lp/soyuz/tests/test_archive.py (+2/-2)
lib/lp/testing/keyserver/inprocess.py (+1/-1)
lib/lp/testing/keyserver/tests/test_inprocess.py (+1/-1)
Reviewer Review Type Date Requested Status
Ioana Lasc (community) Approve
Tom Wardill (community) Approve
Review via email: mp+399800@code.launchpad.net

Commit message

Bump 10-second timeouts to 30 seconds

Description of the change

A number of tests have 10-second timeouts which often fail under high concurrency on buildbot. Bump these to 30 seconds across the board.

To post a comment you must log in.
Revision history for this message
Tom Wardill (twom) :
review: Approve
Revision history for this message
Ioana Lasc (ilasc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
2index 263b592..e9e7ded 100644
3--- a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
4+++ b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
5@@ -66,7 +66,7 @@ from lp.testing.layers import ZopelessDatabaseLayer
6 class TestSignableArchiveWithSigningKey(TestCaseWithFactory):
7
8 layer = ZopelessDatabaseLayer
9- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
10+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
11
12 @defer.inlineCallbacks
13 def setUp(self):
14diff --git a/lib/lp/archivepublisher/tests/test_customupload.py b/lib/lp/archivepublisher/tests/test_customupload.py
15index 476ff95..b93111f 100644
16--- a/lib/lp/archivepublisher/tests/test_customupload.py
17+++ b/lib/lp/archivepublisher/tests/test_customupload.py
18@@ -233,7 +233,7 @@ class TestTarfileVerification(TestCase):
19 class TestSigning(TestCaseWithFactory, RunPartsMixin):
20
21 layer = LaunchpadZopelessLayer
22- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
23+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
24
25 def setUp(self):
26 super(TestSigning, self).setUp()
27diff --git a/lib/lp/archivepublisher/tests/test_publisher.py b/lib/lp/archivepublisher/tests/test_publisher.py
28index 86baa5c..67ec904 100644
29--- a/lib/lp/archivepublisher/tests/test_publisher.py
30+++ b/lib/lp/archivepublisher/tests/test_publisher.py
31@@ -3116,7 +3116,7 @@ class TestPublisherRepositorySignatures(
32 ('overridden distsroot', {'override_distsroot': True}),
33 ]
34
35- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
36+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
37
38 archive_publisher = None
39
40diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
41index b83eef9..18a5bec 100644
42--- a/lib/lp/archivepublisher/tests/test_signing.py
43+++ b/lib/lp/archivepublisher/tests/test_signing.py
44@@ -191,7 +191,7 @@ class FakeMethodCallLog(FakeMethod):
45 class TestSigningHelpers(TestCaseWithFactory):
46
47 layer = ZopelessDatabaseLayer
48- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
49+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
50
51 def setUp(self):
52 super(TestSigningHelpers, self).setUp()
53diff --git a/lib/lp/buildmaster/tests/snapbuildproxy.py b/lib/lp/buildmaster/tests/snapbuildproxy.py
54index 4341bda..f0b0054 100644
55--- a/lib/lp/buildmaster/tests/snapbuildproxy.py
56+++ b/lib/lp/buildmaster/tests/snapbuildproxy.py
57@@ -69,7 +69,7 @@ class InProcessProxyAuthAPIFixture(fixtures.Fixture):
58 class TestSomething(TestCase):
59
60 run_tests_with = AsynchronousDeferredRunTest.make_factory(
61- timeout=10)
62+ timeout=30)
63
64 @defer.inlineCallbacks
65 def setUp(self):
66diff --git a/lib/lp/buildmaster/tests/test_interactor.py b/lib/lp/buildmaster/tests/test_interactor.py
67index 00bd8ff..3abbed3 100644
68--- a/lib/lp/buildmaster/tests/test_interactor.py
69+++ b/lib/lp/buildmaster/tests/test_interactor.py
70@@ -117,7 +117,7 @@ class MockBuilderFactory(BaseBuilderFactory):
71
72 class TestBuilderInteractor(TestCase):
73
74- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
75+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
76
77 def setUp(self):
78 super(TestBuilderInteractor, self).setUp()
79@@ -354,7 +354,7 @@ class TestBuilderInteractorDB(TestCaseWithFactory):
80 """BuilderInteractor tests that need a DB."""
81
82 layer = ZopelessDatabaseLayer
83- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
84+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
85
86 def test_getBuildBehaviour_idle(self):
87 """An idle builder has no build behaviour."""
88@@ -699,7 +699,7 @@ class TestSlaveTimeouts(TestCase):
89 # as required.
90
91 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
92- timeout=10)
93+ timeout=30)
94
95 def setUp(self):
96 super(TestSlaveTimeouts, self).setUp()
97@@ -746,7 +746,7 @@ class TestSlaveConnectionTimeouts(TestCase):
98 # The timeouts in test_connection_timeout are relative to the artificial
99 # Clock rather than to true wallclock time, so it's not a problem for
100 # this timeout to be shorter than them.
101- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
102+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
103
104 def setUp(self):
105 super(TestSlaveConnectionTimeouts, self).setUp()
106diff --git a/lib/lp/code/model/tests/test_recipebuilder.py b/lib/lp/code/model/tests/test_recipebuilder.py
107index 8acc5b8..f6e2b70 100644
108--- a/lib/lp/code/model/tests/test_recipebuilder.py
109+++ b/lib/lp/code/model/tests/test_recipebuilder.py
110@@ -164,7 +164,7 @@ class TestRecipeBuilder(TestRecipeBuilderBase):
111
112 class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
113
114- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
115+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
116
117 def _setBuilderConfig(self):
118 """Setup a temporary builder config."""
119diff --git a/lib/lp/services/librarianserver/tests/test_db.py b/lib/lp/services/librarianserver/tests/test_db.py
120index be7327e..ac1552e 100644
121--- a/lib/lp/services/librarianserver/tests/test_db.py
122+++ b/lib/lp/services/librarianserver/tests/test_db.py
123@@ -87,7 +87,7 @@ class TestLibrarianStuff(TestCase):
124 """Tests for the librarian."""
125
126 layer = LaunchpadZopelessLayer
127- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
128+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
129
130 def setUp(self):
131 super(TestLibrarianStuff, self).setUp()
132diff --git a/lib/lp/services/twistedsupport/tests/test_processmonitor.py b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
133index 5ba2820..3ea4fd7 100644
134--- a/lib/lp/services/twistedsupport/tests/test_processmonitor.py
135+++ b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
136@@ -356,7 +356,7 @@ class TestProcessMonitorProtocolWithTimeout(ProcessTestsMixin, TestCase):
137 class TestRunProcessWithTimeout(TestCase):
138 """Tests for `run_process_with_timeout`."""
139
140- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
141+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
142
143 def test_run_process_with_timeout_invalid_args(self):
144 # `run_process_with_timeout` expects the process 'args' to be a
145diff --git a/lib/lp/soyuz/tests/test_archive.py b/lib/lp/soyuz/tests/test_archive.py
146index f06ae96..419d552 100644
147--- a/lib/lp/soyuz/tests/test_archive.py
148+++ b/lib/lp/soyuz/tests/test_archive.py
149@@ -1863,7 +1863,7 @@ class TestAddArchiveDependencies(TestCaseWithFactory):
150 class TestArchiveDependencies(TestCaseWithFactory):
151
152 layer = LaunchpadZopelessLayer
153- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
154+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
155
156 @defer.inlineCallbacks
157 def test_private_sources_list(self):
158@@ -4073,7 +4073,7 @@ class TestGetSigningKeyData(TestCaseWithFactory):
159 """
160
161 layer = DatabaseFunctionalLayer
162- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
163+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
164
165 def test_getSigningKeyData_no_fingerprint(self):
166 ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
167diff --git a/lib/lp/testing/keyserver/inprocess.py b/lib/lp/testing/keyserver/inprocess.py
168index e937a06..ee82e52 100644
169--- a/lib/lp/testing/keyserver/inprocess.py
170+++ b/lib/lp/testing/keyserver/inprocess.py
171@@ -42,7 +42,7 @@ class InProcessKeyServerFixture(Fixture):
172 class TestSomething(TestCase):
173
174 run_tests_with = AsynchronousDeferredRunTest.make_factory(
175- timeout=10)
176+ timeout=30)
177
178 @defer.inlineCallbacks
179 def setUp(self):
180diff --git a/lib/lp/testing/keyserver/tests/test_inprocess.py b/lib/lp/testing/keyserver/tests/test_inprocess.py
181index 38b55ae..5dd085e 100644
182--- a/lib/lp/testing/keyserver/tests/test_inprocess.py
183+++ b/lib/lp/testing/keyserver/tests/test_inprocess.py
184@@ -24,7 +24,7 @@ from lp.testing.keyserver.web import GREETING
185 class TestInProcessKeyServerFixture(TestCase):
186
187 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
188- timeout=10)
189+ timeout=30)
190
191 @defer.inlineCallbacks
192 def test_url(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: