openstack
/
oslo.utils
Code Issues Proposed changes

Merge "timeutils: utcnow() can return a value with a timezone"

This commit is contained in:
Jenkins 2015-05-24 03:47:50 +00:00 committed by Gerrit Code Review
parent 1ec53c1cfa de017a2dff
commit 7d335e3810
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oslo_utils/timeutils.py
View File

@ -143,8 +143,8 @@ def utcnow_ts(microsecond=False):
return timestamp
def utcnow():
"""Overridable version of utils.utcnow.
def utcnow(with_timezone=False):
"""Overridable version of utils.utcnow that can return a TZ-aware datetime.
See :py:class:`oslo_utils.fixture.TimeFixture`.
@ -154,6 +154,8 @@ def utcnow():
return utcnow.override_time.pop(0)
except AttributeError:
return utcnow.override_time
if with_timezone:
return datetime.datetime.now(tz=iso8601.iso8601.UTC)
return datetime.datetime.utcnow()

3
tests/test_timeutils.py
View File

@ -185,6 +185,9 @@ class TimeUtilsTest(test_base.BaseTestCase):
self.assertTrue(timeutils.utcnow())
self.assertEqual(timeutils.utcnow(True).tzinfo,
iso8601.iso8601.UTC)
def test_advance_time_delta(self):
timeutils.set_time_override(self.one_minute_before)
timeutils.advance_time_delta(datetime.timedelta(seconds=60))