openstack
/
heat
Code Issues Proposed changes

Merge "Fix time mocking on wait condition timeout tests"

This commit is contained in:
Jenkins 2015-12-09 10:30:14 +00:00 committed by Gerrit Code Review
parent b6ca223944 b8c519909f
commit ed22ac69f9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
heat/tests/aws/test_waitcondition.py
View File

@ -204,8 +204,9 @@ class WaitConditionTest(common.HeatTestCase):
self.stack.timeout_secs().MultipleTimes().AndReturn(None)
now = timeutils.utcnow()
fake_clock = [now + datetime.timedelta(0, t)
for t in (0, 0.001, 0.1, 4.1, 5.1)]
periods = [0, 0.001, 0.1, 4.1, 5.1]
periods.extend(range(10, 100, 5))
fake_clock = [now + datetime.timedelta(0, t) for t in periods]
timeutils.set_time_override(fake_clock)
self.addCleanup(timeutils.clear_time_override)

5
heat/tests/openstack/heat/test_waitcondition.py
View File

@ -225,8 +225,9 @@ class HeatWaitConditionTest(common.HeatTestCase):
self.stack.timeout_secs().MultipleTimes().AndReturn(None)
now = timeutils.utcnow()
fake_clock = [now + datetime.timedelta(0, t)
for t in (0, 0.001, 0.1, 4.1, 5.1)]
periods = [0, 0.001, 0.1, 4.1, 5.1]
periods.extend(range(10, 100, 5))
fake_clock = [now + datetime.timedelta(0, t) for t in periods]
timeutils.set_time_override(fake_clock)
self.addCleanup(timeutils.clear_time_override)