From b8c519909f2cacb31a4415803f72383149b565ac Mon Sep 17 00:00:00 2001 From: Thomas Herve Date: Wed, 9 Dec 2015 09:53:12 +0100 Subject: [PATCH] Fix time mocking on wait condition timeout tests Extend the time override used when testing timeouts for wait conditions, so that real time isn't used for waiting for the failure. Change-Id: Ib1042fc748ecc490d315ec5a5844ceacc50534e0 Partial-Bug: #1524047 --- heat/tests/aws/test_waitcondition.py | 5 +++-- heat/tests/openstack/heat/test_waitcondition.py | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/heat/tests/aws/test_waitcondition.py b/heat/tests/aws/test_waitcondition.py index 3fe856e640..854390e6f0 100644 --- a/heat/tests/aws/test_waitcondition.py +++ b/heat/tests/aws/test_waitcondition.py @@ -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) diff --git a/heat/tests/openstack/heat/test_waitcondition.py b/heat/tests/openstack/heat/test_waitcondition.py index 7d2af8c96c..5848fa3c71 100644 --- a/heat/tests/openstack/heat/test_waitcondition.py +++ b/heat/tests/openstack/heat/test_waitcondition.py @@ -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)