openstack
/
heat
Code Issues Proposed changes

Use negative timeout for convergence unittests 

This patch replace old timeout "0" on new value "-1".
This should fix issues where we want to test an expired timeout,
but a timeout of zero can evaluate to non-expired when
the endtime and current time are equal.

Closes-Bug: #1515932
Change-Id: I4fd09d6af5142758df6ab80f393f70f71ac60c54
This commit is contained in:
Sergey Kraynev 2015-11-13 05:40:14 -05:00
parent 71d7b4572f
commit a50eeef3e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/tests/test_resource.py
View File

@ -1681,7 +1681,7 @@ class ResourceTest(common.HeatTestCase):
self.assertRaises(scheduler.Timeout, res.create_convergence,
self.stack.t.id, res_data, 'engine-007',
0)
-1)
def test_create_convergence_sets_requires_for_failure(self):
'''
@ -1782,7 +1782,7 @@ class ResourceTest(common.HeatTestCase):
res_data = {}
self.assertRaises(scheduler.Timeout, res.update_convergence,
new_temp.id, res_data, 'engine-007',
0)
-1)
def test_update_in_progress_convergence(self):
tmpl = rsrc_defn.ResourceDefinition('test_res', 'Foo')
@ -2072,7 +2072,7 @@ class ResourceTest(common.HeatTestCase):
tmpl = rsrc_defn.ResourceDefinition('test_res', 'Foo')
res = generic_rsrc.GenericResource('test_res', tmpl, self.stack)
res._store()
timeout = 0 # to emulate timeout
timeout = -1 # to emulate timeout
self.assertRaises(scheduler.Timeout, res.delete_convergence,
1, {}, 'engine-007', timeout)