Skip to content

Commit d128dca

Browse files
committed
Ensure EPOCH_DATETIME is in UTC
This fixes an issue with the time set by @freeze_time being different than the expected EPOCH value.
1 parent d3a733d commit d128dca

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/signer_test.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import unittest
2-
from datetime import datetime
2+
from datetime import datetime, timezone
33
import os
44
from freezegun import freeze_time
55
from mauth_client.signable import RequestSignable
66
from mauth_client.signer import Signer
77

88
APP_UUID = "5ff4257e-9c16-11e0-b048-0026bbfffe5e"
99
EPOCH = "1309891855" # 2011-07-05 18:50:00 UTC
10-
EPOCH_DATETIME = datetime.fromtimestamp(float(EPOCH))
10+
EPOCH_DATETIME = datetime.fromtimestamp(float(EPOCH), timezone.utc)
1111
REQUEST_ATTRIBUTES = {"method": "GET", "url": "https://example.org/studies/123/users?k=v"}
1212
ADDITIONAL_ATTRIBUTES = {"app_uuid": APP_UUID, "time": EPOCH}
1313

@@ -40,7 +40,7 @@ def test_signed_headers(self):
4040
"MCC-Time": EPOCH,
4141
}
4242

43-
signed_headers = self.signer.signed_headers(self.signable, ADDITIONAL_ATTRIBUTES)
43+
signed_headers = self.signer.signed_headers(self.signable)
4444
self.assertEqual(signed_headers.keys(), expected.keys())
4545
self.assertRegex(signed_headers["X-MWS-Authentication"], expected["X-MWS-Authentication"])
4646
self.assertRegex(signed_headers["MCC-Authentication"], expected["MCC-Authentication"])
@@ -51,7 +51,7 @@ def test_signed_headers(self):
5151
def test_signed_headers_v1_only(self):
5252
expected = {"X-MWS-Authentication": r"\AMWS {}:".format(APP_UUID), "X-MWS-Time": EPOCH}
5353

54-
signed_headers = self.signer_v1_only.signed_headers(self.signable, ADDITIONAL_ATTRIBUTES)
54+
signed_headers = self.signer_v1_only.signed_headers(self.signable)
5555
self.assertEqual(signed_headers.keys(), expected.keys())
5656
self.assertRegex(signed_headers["X-MWS-Authentication"], expected["X-MWS-Authentication"])
5757
self.assertEqual(signed_headers["X-MWS-Time"], expected["X-MWS-Time"])
@@ -60,7 +60,7 @@ def test_signed_headers_v1_only(self):
6060
def test_signed_headers_v2_only(self):
6161
expected = {"MCC-Authentication": r"MWSV2 {}:[^;]*;".format(APP_UUID), "MCC-Time": EPOCH}
6262

63-
signed_headers = self.signer_v2_only.signed_headers(self.signable, ADDITIONAL_ATTRIBUTES)
63+
signed_headers = self.signer_v2_only.signed_headers(self.signable)
6464
self.assertEqual(signed_headers.keys(), expected.keys())
6565
self.assertRegex(signed_headers["MCC-Authentication"], expected["MCC-Authentication"])
6666
self.assertEqual(signed_headers["MCC-Time"], expected["MCC-Time"])

0 commit comments

Comments
 (0)