Merge lp:~allenap/maas/spurious-oauth-headers-test into lp:~maas-committers/maas/trunk

[Gavin Panella]

Be a little more flexible with the oauth_timestamp field in test_oauth_headers.

Previously this was failing when run just before the clock ticked to the next second.

[Mike Pontillo (mpontillo)]

Interesting. I guess running the tests in parallel is enough to make this take more than 1 second more often.

review: Approve

[Lee Trager (ltrager)]

I actually just did a similar fix for test_oauth_headers in lp:~ltrager/maas/use_testing_metadata_api

review: Approve

[Gavin Panella (allenap)]

> Interesting. I guess running the tests in parallel is enough to make
> this take more than 1 second more often.

I can trigger this just by running the test a few times with
bin/test.rack.

Thanks for the review!

[Gavin Panella (allenap)]

> I actually just did a similar fix for test_oauth_headers in
> lp:~ltrager/maas/use_testing_metadata_api

Ah, sorry, this will conflict with yours, but I hope it won't be too onerous to resolve.

Thanks for the review!

=== modified file 'src/provisioningserver/refresh/tests/test_maas_api_helper.py'
--- src/provisioningserver/refresh/tests/test_maas_api_helper.py	2017-01-11 14:05:26 +0000
+++ src/provisioningserver/refresh/tests/test_maas_api_helper.py	2017-01-20 15:55:40 +0000
@@ -13,14 +13,30 @@
 import urllib
 
 from maastesting.factory import factory
-from maastesting.matchers import MockAnyCall
+from maastesting.matchers import (
+    GreaterThanOrEqual,
+    LessThanOrEqual,
+    MockAnyCall,
+)
 from maastesting.testcase import MAASTestCase
 from provisioningserver.refresh import maas_api_helper
+from testtools.matchers import (
+    AfterPreprocessing,
+    Equals,
+    MatchesAll,
+    MatchesDict,
+)
 
 
 class TestHeaders(MAASTestCase):
 
     def test_oauth_headers(self):
+        now = time.time()
+        is_about_now = MatchesAll(
+            GreaterThanOrEqual(int(now)),
+            LessThanOrEqual(int(now) + 3),
+        )
+
         url = factory.make_name("url")
         consumer_key = factory.make_name("consumer_key")
         token_key = factory.make_name("token_key")
@@ -39,14 +55,15 @@
         self.assertIn('oauth_nonce', oauth_arguments)
         oauth_arguments.pop('oauth_nonce', None)
 
-        self.assertEqual({
-            'oauth_timestamp': format(time.time(), ".0f"),
-            'oauth_version': '1.0',
-            'oauth_signature_method': 'PLAINTEXT',
-            'oauth_consumer_key': consumer_key,
-            'oauth_token': token_key,
-            'oauth_signature': "%s%%26%s" % (consumer_secret, token_secret),
-            }, oauth_arguments)
+        self.assertThat(oauth_arguments, MatchesDict({
+            'oauth_timestamp': AfterPreprocessing(int, is_about_now),
+            'oauth_version': Equals('1.0'),
+            'oauth_signature_method': Equals('PLAINTEXT'),
+            'oauth_consumer_key': Equals(consumer_key),
+            'oauth_token': Equals(token_key),
+            'oauth_signature': Equals(
+                "%s%%26%s" % (consumer_secret, token_secret)),
+        }))
 
     def test_authenticate_headers_appends_oauth(self):
         url = factory.make_name("url")