Launchpad itself

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

  1. Git
  2. lp:~cjwatson/launchpad
  3. loosen-test-timeouts
  4. Merge into 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
1diff --git a/lib/lp/codehosting/puller/tests/test_scheduler.py b/lib/lp/codehosting/puller/tests/test_scheduler.py
2index 2b08509..34d53b6 100644
3--- a/lib/lp/codehosting/puller/tests/test_scheduler.py
4+++ b/lib/lp/codehosting/puller/tests/test_scheduler.py
5@@ -553,7 +553,7 @@ class TestPullerMasterIntegration(PullerBranchTestCase):
6 """Tests for the puller master that launch sub-processes."""
7
8 layer = ZopelessAppServerLayer
9- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
10+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
11
12 def setUp(self):
13 super(TestPullerMasterIntegration, self).setUp()
14diff --git a/lib/lp/services/librarianserver/tests/test_storage_db.py b/lib/lp/services/librarianserver/tests/test_storage_db.py
15index 47fe847..b24d87b 100644
16--- a/lib/lp/services/librarianserver/tests/test_storage_db.py
17+++ b/lib/lp/services/librarianserver/tests/test_storage_db.py
18@@ -146,7 +146,7 @@ class LibrarianStorageDBTests(TestCase):
19 class LibrarianStorageSwiftTests(TestCase):
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(LibrarianStorageSwiftTests, self).setUp()
27diff --git a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
28index 7cd3cad..d5a2068 100644
29--- a/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
30+++ b/lib/lp/soyuz/adapters/tests/test_archivedependencies.py
31@@ -128,7 +128,7 @@ class TestSourcesList(TestCaseWithFactory):
32 """Test sources.list contents for building, and related mechanisms."""
33
34 layer = LaunchpadZopelessLayer
35- run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=10)
36+ run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=30)
37
38 ubuntu_components = [
39 "main", "restricted", "universe", "multiverse", "partner"]

Subscribers

People subscribed via source and target branches

to status/vote changes: