MAAS

Merge ~bjornt/maas:bootresources-intermittent-timeout into maas:master

  1. Git
  2. lp:~bjornt/maas
  3. bootresources-intermittent-timeout
  4. Merge into master
Proposed by Björn Tillenius
Status: Merged
Approved by: Björn Tillenius
Approved revision: fa9719d97d7aadbc914ac12569f96b3e4b62d798
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~bjornt/maas:bootresources-intermittent-timeout
Merge into: maas:master
Diff against target: 22 lines (+2/-2)
1 file modified
src/maasserver/tests/test_bootresources.py (+2/-2)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
MAAS Lander Approve
Review via email: mp+410132@code.launchpad.net

Commit message

Increase timeout for bootresources tests.

test_finalize_calls_notify_errback was failing intermittently. Given the
timeout was only 1 seconds, it's likely the system was simply overloaded
and took longer than 1 second to complete.

Now it uses the standard 30 seconds timeout all other tests use.

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b bootresources-intermittent-timeout lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: fa9719d97d7aadbc914ac12569f96b3e4b62d798

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b bootresources-intermittent-timeout lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11267/consoleText

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/tests/test_bootresources.py b/src/maasserver/tests/test_bootresources.py
2index 676c6e0..1943e49 100644
3--- a/src/maasserver/tests/test_bootresources.py
4+++ b/src/maasserver/tests/test_bootresources.py
5@@ -1496,7 +1496,7 @@ class TestBootResourceTransactional(MAASTransactionServerTestCase):
6 written_data = stream.read()
7 self.assertEqual(content, written_data)
8
9- @asynchronous(timeout=1)
10+ @wait_for_reactor
11 def test_finalize_calls_notify_errback(self):
12 @transactional
13 def create_store(testcase):
14@@ -1514,7 +1514,7 @@ class TestBootResourceTransactional(MAASTransactionServerTestCase):
15 d.addErrback(lambda failure: failure.trap(Exception))
16 return d
17
18- @asynchronous(timeout=1)
19+ @wait_for_reactor
20 def test_finalize_calls_notify_callback(self):
21 @transactional
22 def create_store(testcase):

Subscribers

People subscribed via source and target branches