launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:test-timeouts into launchpad:master.

Commit message:
Bump 10-second timeouts to 30 seconds

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

A number of tests have 10-second timeouts which often fail under high concurrency on buildbot.  Bump these to 30 seconds across the board.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:test-timeouts into launchpad:master.

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
 class TestSignableArchiveWithSigningKey(TestCaseWithFactory):
 
     layer = ZopelessDatabaseLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     @defer.inlineCallbacks
     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):
 class TestSigning(TestCaseWithFactory, RunPartsMixin):
 
     layer = LaunchpadZopelessLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         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(
         ('overridden distsroot', {'override_distsroot': True}),
         ]
 
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     archive_publisher = None
 
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):
 class TestSigningHelpers(TestCaseWithFactory):
 
     layer = ZopelessDatabaseLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         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):
         class TestSomething(TestCase):
 
             run_tests_with = AsynchronousDeferredRunTest.make_factory(
-                timeout=10)
+                timeout=30)
 
             @defer.inlineCallbacks
             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):
 
 class TestBuilderInteractor(TestCase):
 
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         super(TestBuilderInteractor, self).setUp()
@@ -354,7 +354,7 @@ class TestBuilderInteractorDB(TestCaseWithFactory):
     """BuilderInteractor tests that need a DB."""
 
     layer = ZopelessDatabaseLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def test_getBuildBehaviour_idle(self):
         """An idle builder has no build behaviour."""
@@ -699,7 +699,7 @@ class TestSlaveTimeouts(TestCase):
     # as required.
 
     run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
-        timeout=10)
+        timeout=30)
 
     def setUp(self):
         super(TestSlaveTimeouts, self).setUp()
@@ -746,7 +746,7 @@ class TestSlaveConnectionTimeouts(TestCase):
     # The timeouts in test_connection_timeout are relative to the artificial
     # Clock rather than to true wallclock time, so it's not a problem for
     # this timeout to be shorter than them.
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         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):
 
 class TestAsyncRecipeBuilder(TestRecipeBuilderBase):
 
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def _setBuilderConfig(self):
         """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):
     """Tests for the librarian."""
 
     layer = LaunchpadZopelessLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def setUp(self):
         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):
 class TestRunProcessWithTimeout(TestCase):
     """Tests for `run_process_with_timeout`."""
 
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def test_run_process_with_timeout_invalid_args(self):
         # `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):
 class TestArchiveDependencies(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     @defer.inlineCallbacks
     def test_private_sources_list(self):
@@ -4073,7 +4073,7 @@ class TestGetSigningKeyData(TestCaseWithFactory):
     """
 
     layer = DatabaseFunctionalLayer
-    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
 
     def test_getSigningKeyData_no_fingerprint(self):
         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):
         class TestSomething(TestCase):
 
             run_tests_with = AsynchronousDeferredRunTest.make_factory(
-                timeout=10)
+                timeout=30)
 
             @defer.inlineCallbacks
             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
 class TestInProcessKeyServerFixture(TestCase):
 
     run_tests_with = AsynchronousDeferredRunTestForBrokenTwisted.make_factory(
-        timeout=10)
+        timeout=30)
 
     @defer.inlineCallbacks
     def test_url(self):