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
diff --git a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
index 263b592..e9e7ded 100644
--- a/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
+++ b/lib/lp/archivepublisher/tests/test_archivegpgsigningkey.py
@@ -66,7 +66,7 @@ from lp.testing.layers import ZopelessDatabaseLayer
66class TestSignableArchiveWithSigningKey(TestCaseWithFactory):66class TestSignableArchiveWithSigningKey(TestCaseWithFactory):
6767
68 layer = ZopelessDatabaseLayer68 layer = ZopelessDatabaseLayer
69 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)69 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
7070
71 @defer.inlineCallbacks71 @defer.inlineCallbacks
72 def setUp(self):72 def setUp(self):
diff --git a/lib/lp/archivepublisher/tests/test_customupload.py b/lib/lp/archivepublisher/tests/test_customupload.py
index 476ff95..b93111f 100644
--- a/lib/lp/archivepublisher/tests/test_customupload.py
+++ b/lib/lp/archivepublisher/tests/test_customupload.py
@@ -233,7 +233,7 @@ class TestTarfileVerification(TestCase):
233class TestSigning(TestCaseWithFactory, RunPartsMixin):233class TestSigning(TestCaseWithFactory, RunPartsMixin):
234234
235 layer = LaunchpadZopelessLayer235 layer = LaunchpadZopelessLayer
236 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)236 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
237237
238 def setUp(self):238 def setUp(self):
239 super(TestSigning, self).setUp()239 super(TestSigning, self).setUp()
diff --git a/lib/lp/archivepublisher/tests/test_publisher.py b/lib/lp/archivepublisher/tests/test_publisher.py
index 86baa5c..67ec904 100644
--- a/lib/lp/archivepublisher/tests/test_publisher.py
+++ b/lib/lp/archivepublisher/tests/test_publisher.py
@@ -3116,7 +3116,7 @@ class TestPublisherRepositorySignatures(
3116 ('overridden distsroot', {'override_distsroot': True}),3116 ('overridden distsroot', {'override_distsroot': True}),
3117 ]3117 ]
31183118
3119 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)3119 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
31203120
3121 archive_publisher = None3121 archive_publisher = None
31223122
diff --git a/lib/lp/archivepublisher/tests/test_signing.py b/lib/lp/archivepublisher/tests/test_signing.py
index b83eef9..18a5bec 100644
--- a/lib/lp/archivepublisher/tests/test_signing.py
+++ b/lib/lp/archivepublisher/tests/test_signing.py
@@ -191,7 +191,7 @@ class FakeMethodCallLog(FakeMethod):
191class TestSigningHelpers(TestCaseWithFactory):191class TestSigningHelpers(TestCaseWithFactory):
192192
193 layer = ZopelessDatabaseLayer193 layer = ZopelessDatabaseLayer
194 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)194 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
195195
196 def setUp(self):196 def setUp(self):
197 super(TestSigningHelpers, self).setUp()197 super(TestSigningHelpers, self).setUp()
diff --git a/lib/lp/buildmaster/tests/snapbuildproxy.py b/lib/lp/buildmaster/tests/snapbuildproxy.py
index 4341bda..f0b0054 100644
--- a/lib/lp/buildmaster/tests/snapbuildproxy.py
+++ b/lib/lp/buildmaster/tests/snapbuildproxy.py
@@ -69,7 +69,7 @@ class InProcessProxyAuthAPIFixture(fixtures.Fixture):
69 class TestSomething(TestCase):69 class TestSomething(TestCase):
7070
71 run_tests_with = AsynchronousDeferredRunTest.make_factory(71 run_tests_with = AsynchronousDeferredRunTest.make_factory(
72 timeout=10)72 timeout=30)
7373
74 @defer.inlineCallbacks74 @defer.inlineCallbacks
75 def setUp(self):75 def setUp(self):
diff --git a/lib/lp/buildmaster/tests/test_interactor.py b/lib/lp/buildmaster/tests/test_interactor.py
index 00bd8ff..3abbed3 100644
--- a/lib/lp/buildmaster/tests/test_interactor.py
+++ b/lib/lp/buildmaster/tests/test_interactor.py
@@ -117,7 +117,7 @@ class MockBuilderFactory(BaseBuilderFactory):
117117
118class TestBuilderInteractor(TestCase):118class TestBuilderInteractor(TestCase):
119119
120 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)120 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
121121
122 def setUp(self):122 def setUp(self):
123 super(TestBuilderInteractor, self).setUp()123 super(TestBuilderInteractor, self).setUp()
@@ -354,7 +354,7 @@ class TestBuilderInteractorDB(TestCaseWithFactory):
354 """BuilderInteractor tests that need a DB."""354 """BuilderInteractor tests that need a DB."""
355355
356 layer = ZopelessDatabaseLayer356 layer = ZopelessDatabaseLayer
357 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)357 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
358358
359 def test_getBuildBehaviour_idle(self):359 def test_getBuildBehaviour_idle(self):
360 """An idle builder has no build behaviour."""360 """An idle builder has no build behaviour."""
@@ -699,7 +699,7 @@ class TestSlaveTimeouts(TestCase):
699 # as required.699 # as required.
700700
701 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(701 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
702 timeout=10)702 timeout=30)
703703
704 def setUp(self):704 def setUp(self):
705 super(TestSlaveTimeouts, self).setUp()705 super(TestSlaveTimeouts, self).setUp()
@@ -746,7 +746,7 @@ class TestSlaveConnectionTimeouts(TestCase):
746 # The timeouts in test_connection_timeout are relative to the artificial746 # The timeouts in test_connection_timeout are relative to the artificial
747 # Clock rather than to true wallclock time, so it's not a problem for747 # Clock rather than to true wallclock time, so it's not a problem for
748 # this timeout to be shorter than them.748 # this timeout to be shorter than them.
749 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)749 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
750750
751 def setUp(self):751 def setUp(self):
752 super(TestSlaveConnectionTimeouts, self).setUp()752 super(TestSlaveConnectionTimeouts, self).setUp()
diff --git a/lib/lp/code/model/tests/test_recipebuilder.py b/lib/lp/code/model/tests/test_recipebuilder.py
index 8acc5b8..f6e2b70 100644
--- a/lib/lp/code/model/tests/test_recipebuilder.py
+++ b/lib/lp/code/model/tests/test_recipebuilder.py
@@ -164,7 +164,7 @@ class TestRecipeBuilder(TestRecipeBuilderBase):
164164
165class TestAsyncRecipeBuilder(TestRecipeBuilderBase):165class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
166166
167 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)167 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
168168
169 def _setBuilderConfig(self):169 def _setBuilderConfig(self):
170 """Setup a temporary builder config."""170 """Setup a temporary builder config."""
diff --git a/lib/lp/services/librarianserver/tests/test_db.py b/lib/lp/services/librarianserver/tests/test_db.py
index be7327e..ac1552e 100644
--- a/lib/lp/services/librarianserver/tests/test_db.py
+++ b/lib/lp/services/librarianserver/tests/test_db.py
@@ -87,7 +87,7 @@ class TestLibrarianStuff(TestCase):
87 """Tests for the librarian."""87 """Tests for the librarian."""
8888
89 layer = LaunchpadZopelessLayer89 layer = LaunchpadZopelessLayer
90 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)90 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
9191
92 def setUp(self):92 def setUp(self):
93 super(TestLibrarianStuff, self).setUp()93 super(TestLibrarianStuff, self).setUp()
diff --git a/lib/lp/services/twistedsupport/tests/test_processmonitor.py b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
index 5ba2820..3ea4fd7 100644
--- a/lib/lp/services/twistedsupport/tests/test_processmonitor.py
+++ b/lib/lp/services/twistedsupport/tests/test_processmonitor.py
@@ -356,7 +356,7 @@ class TestProcessMonitorProtocolWithTimeout(ProcessTestsMixin, TestCase):
356class TestRunProcessWithTimeout(TestCase):356class TestRunProcessWithTimeout(TestCase):
357 """Tests for `run_process_with_timeout`."""357 """Tests for `run_process_with_timeout`."""
358358
359 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)359 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
360360
361 def test_run_process_with_timeout_invalid_args(self):361 def test_run_process_with_timeout_invalid_args(self):
362 # `run_process_with_timeout` expects the process 'args' to be a362 # `run_process_with_timeout` expects the process 'args' to be a
diff --git a/lib/lp/soyuz/tests/test_archive.py b/lib/lp/soyuz/tests/test_archive.py
index f06ae96..419d552 100644
--- a/lib/lp/soyuz/tests/test_archive.py
+++ b/lib/lp/soyuz/tests/test_archive.py
@@ -1863,7 +1863,7 @@ class TestAddArchiveDependencies(TestCaseWithFactory):
1863class TestArchiveDependencies(TestCaseWithFactory):1863class TestArchiveDependencies(TestCaseWithFactory):
18641864
1865 layer = LaunchpadZopelessLayer1865 layer = LaunchpadZopelessLayer
1866 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)1866 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
18671867
1868 @defer.inlineCallbacks1868 @defer.inlineCallbacks
1869 def test_private_sources_list(self):1869 def test_private_sources_list(self):
@@ -4073,7 +4073,7 @@ class TestGetSigningKeyData(TestCaseWithFactory):
4073 """4073 """
40744074
4075 layer = DatabaseFunctionalLayer4075 layer = DatabaseFunctionalLayer
4076 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)4076 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
40774077
4078 def test_getSigningKeyData_no_fingerprint(self):4078 def test_getSigningKeyData_no_fingerprint(self):
4079 ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)4079 ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
diff --git a/lib/lp/testing/keyserver/inprocess.py b/lib/lp/testing/keyserver/inprocess.py
index e937a06..ee82e52 100644
--- a/lib/lp/testing/keyserver/inprocess.py
+++ b/lib/lp/testing/keyserver/inprocess.py
@@ -42,7 +42,7 @@ class InProcessKeyServerFixture(Fixture):
42 class TestSomething(TestCase):42 class TestSomething(TestCase):
4343
44 run_tests_with = AsynchronousDeferredRunTest.make_factory(44 run_tests_with = AsynchronousDeferredRunTest.make_factory(
45 timeout=10)45 timeout=30)
4646
47 @defer.inlineCallbacks47 @defer.inlineCallbacks
48 def setUp(self):48 def setUp(self):
diff --git a/lib/lp/testing/keyserver/tests/test_inprocess.py b/lib/lp/testing/keyserver/tests/test_inprocess.py
index 38b55ae..5dd085e 100644
--- a/lib/lp/testing/keyserver/tests/test_inprocess.py
+++ b/lib/lp/testing/keyserver/tests/test_inprocess.py
@@ -24,7 +24,7 @@ from lp.testing.keyserver.web import GREETING
24class TestInProcessKeyServerFixture(TestCase):24class TestInProcessKeyServerFixture(TestCase):
2525
26 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(26 run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
27 timeout=10)27 timeout=30)
2828
29 @defer.inlineCallbacks29 @defer.inlineCallbacks
30 def test_url(self):30 def test_url(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: