MAAS

Merge ~adam-collard/maas:flaky-test-keys-1990873 into maas:master

  1. Git
  2. lp:~adam-collard/maas
  3. flaky-test-keys-1990873
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: c8398518461f6ca736289f88baf765386bf673bd
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~adam-collard/maas:flaky-test-keys-1990873
Merge into: maas:master
Diff against target: 45 lines (+5/-1)
1 file modified
src/maasserver/utils/tests/test_keys.py (+5/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Alexsander de Souza Approve
Review via email: mp+430494@code.launchpad.net

Commit message

LP:1990873 Add deadline=None to hypothesis tests

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

UNIT TESTS
-b flaky-test-keys-1990873 lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/787/consoleText
COMMIT: c8398518461f6ca736289f88baf765386bf673bd

review: Needs Fixing
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

+1

review: Approve
Revision history for this message
Alexsander de Souza (alexsander-souza) wrote :

jenkins: !test

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

UNIT TESTS
-b flaky-test-keys-1990873 lp:~adam-collard/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c8398518461f6ca736289f88baf765386bf673bd

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/maasserver/utils/tests/test_keys.py b/src/maasserver/utils/tests/test_keys.py
index d3689e3..eda783d 100644
--- a/src/maasserver/utils/tests/test_keys.py
+++ b/src/maasserver/utils/tests/test_keys.py
@@ -6,7 +6,7 @@
66
7import http7import http
88
9from hypothesis import given9from hypothesis import given, settings
10from hypothesis.strategies import sampled_from10from hypothesis.strategies import sampled_from
11import requests as requests_module11import requests as requests_module
12from testtools.matchers import Equals12from testtools.matchers import Equals
@@ -49,6 +49,7 @@ class TestKeys(MAASServerTestCase):
49 proxies = get_proxies()49 proxies = get_proxies()
50 self.assertIsNone(proxies)50 self.assertIsNone(proxies)
5151
52 @settings(deadline=None)
52 @given(sampled_from([KEYS_PROTOCOL_TYPE.LP, KEYS_PROTOCOL_TYPE.GH]))53 @given(sampled_from([KEYS_PROTOCOL_TYPE.LP, KEYS_PROTOCOL_TYPE.GH]))
53 def test_get_protocol_keys_attempts_retrival(self, protocol):54 def test_get_protocol_keys_attempts_retrival(self, protocol):
54 auth_id = factory.make_name("auth_id")55 auth_id = factory.make_name("auth_id")
@@ -59,6 +60,7 @@ class TestKeys(MAASServerTestCase):
59 get_protocol_keys(protocol, auth_id)60 get_protocol_keys(protocol, auth_id)
60 self.assertThat(mock_get_keys, MockCalledOnceWith(auth_id))61 self.assertThat(mock_get_keys, MockCalledOnceWith(auth_id))
6162
63 @settings(deadline=None)
62 @given(sampled_from([KEYS_PROTOCOL_TYPE.LP, KEYS_PROTOCOL_TYPE.GH]))64 @given(sampled_from([KEYS_PROTOCOL_TYPE.LP, KEYS_PROTOCOL_TYPE.GH]))
63 def test_get_protocol_keys_crashes_on_no_keys(self, protocol):65 def test_get_protocol_keys_crashes_on_no_keys(self, protocol):
64 auth_id = factory.make_name("auth_id")66 auth_id = factory.make_name("auth_id")
@@ -85,6 +87,7 @@ class TestKeys(MAASServerTestCase):
85 keys, Equals([key for key in key_string.splitlines() if key])87 keys, Equals([key for key in key_string.splitlines() if key])
86 )88 )
8789
90 @settings(deadline=None)
88 @given(sampled_from([http.HTTPStatus.NOT_FOUND, http.HTTPStatus.GONE]))91 @given(sampled_from([http.HTTPStatus.NOT_FOUND, http.HTTPStatus.GONE]))
89 def test_get_launchpad_crashes_for_user_not_found(self, error):92 def test_get_launchpad_crashes_for_user_not_found(self, error):
90 auth_id = factory.make_name("auth_id")93 auth_id = factory.make_name("auth_id")
@@ -104,6 +107,7 @@ class TestKeys(MAASServerTestCase):
104 keys, Equals([data["key"] for data in key_string if "key" in data])107 keys, Equals([data["key"] for data in key_string if "key" in data])
105 )108 )
106109
110 @settings(deadline=None)
107 @given(sampled_from([http.HTTPStatus.NOT_FOUND, http.HTTPStatus.GONE]))111 @given(sampled_from([http.HTTPStatus.NOT_FOUND, http.HTTPStatus.GONE]))
108 def test_get_github_crashes_for_user_not_found(self, error):112 def test_get_github_crashes_for_user_not_found(self, error):
109 auth_id = factory.make_name("auth_id")113 auth_id = factory.make_name("auth_id")

Subscribers

People subscribed via source and target branches