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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: bc75360349e815d331d7e9a9bdea5fb9c50d3089
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:loosen-test-timeouts
Merge into: launchpad:master
Diff against target: 39 lines (+3/-3)
3 files modified
lib/lp/codehosting/puller/tests/test_scheduler.py (+1/-1)
lib/lp/services/librarianserver/tests/test_storage_db.py (+1/-1)
lib/lp/soyuz/adapters/tests/test_archivedependencies.py (+1/-1)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+390870@code.launchpad.net

Commit message

Loosen a few timeouts in tests

Description of the change

These can go wrong if the test runner is somewhat slow.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/lib/lp/codehosting/puller/tests/test_scheduler.py b/lib/lp/codehosting/puller/tests/test_scheduler.py
index 2b08509..34d53b6 100644
--- a/lib/lp/codehosting/puller/tests/test_scheduler.py
+++ b/lib/lp/codehosting/puller/tests/test_scheduler.py
@@ -553,7 +553,7 @@ class TestPullerMasterIntegration(PullerBranchTestCase):
553 """Tests for the puller master that launch sub-processes."""553 """Tests for the puller master that launch sub-processes."""
554554
555 layer = ZopelessAppServerLayer555 layer = ZopelessAppServerLayer
556 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)556 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
557557
558 def setUp(self):558 def setUp(self):
559 super(TestPullerMasterIntegration, self).setUp()559 super(TestPullerMasterIntegration, self).setUp()
diff --git a/lib/lp/services/librarianserver/tests/test_storage_db.py b/lib/lp/services/librarianserver/tests/test_storage_db.py
index 47fe847..b24d87b 100644
--- a/lib/lp/services/librarianserver/tests/test_storage_db.py
+++ b/lib/lp/services/librarianserver/tests/test_storage_db.py
@@ -146,7 +146,7 @@ class LibrarianStorageDBTests(TestCase):
146class LibrarianStorageSwiftTests(TestCase):146class LibrarianStorageSwiftTests(TestCase):
147147
148 layer = LaunchpadZopelessLayer148 layer = LaunchpadZopelessLayer
149 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)149 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
150150
151 def setUp(self):151 def setUp(self):
152 super(LibrarianStorageSwiftTests, self).setUp()152 super(LibrarianStorageSwiftTests, self).setUp()
diff --git a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
index 7cd3cad..d5a2068 100644
--- a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
+++ b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
@@ -128,7 +128,7 @@ class TestSourcesList(TestCaseWithFactory):
128 """Test sources.list contents for building, and related mechanisms."""128 """Test sources.list contents for building, and related mechanisms."""
129129
130 layer = LaunchpadZopelessLayer130 layer = LaunchpadZopelessLayer
131 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)131 run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
132132
133 ubuntu_components = [133 ubuntu_components = [
134 "main", "restricted", "universe", "multiverse", "partner"]134 "main", "restricted", "universe", "multiverse", "partner"]

Subscribers

People subscribed via source and target branches

to status/vote changes: