diff options
| -rw-r--r-- | openstack/common/timeutils.py | 3 | ||||
| -rw-r--r-- | tests/unit/test_timeutils.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/openstack/common/timeutils.py b/openstack/common/timeutils.py index a7b2ce3..5eeaf70 100644 --- a/openstack/common/timeutils.py +++ b/openstack/common/timeutils.py @@ -19,6 +19,7 @@ Time related utilities and helper functions. """ +import calendar import datetime import time @@ -74,7 +75,7 @@ def is_older_than(before, seconds): def utcnow_ts(): """Timestamp version of our utcnow function.""" - return time.mktime(utcnow().timetuple()) + return calendar.timegm(utcnow().timetuple()) def utcnow(): diff --git a/tests/unit/test_timeutils.py b/tests/unit/test_timeutils.py index ba68235..d0b773a 100644 --- a/tests/unit/test_timeutils.py +++ b/tests/unit/test_timeutils.py @@ -70,7 +70,10 @@ class TimeUtilsTest(unittest.TestCase): self.assertFalse(expect_false) def test_utcnow_ts(self): - skynet_self_aware_timestamp = 872806440.0 + skynet_self_aware_timestamp = 872835240 + dt = datetime.datetime.utcfromtimestamp(skynet_self_aware_timestamp) + expect = dt.replace(tzinfo=iso8601.iso8601.UTC) + self.assertEqual(self.skynet_self_aware_time, expect) with mock.patch('datetime.datetime') as datetime_mock: datetime_mock.utcnow.return_value = self.skynet_self_aware_time ts = timeutils.utcnow_ts() |