openstack
/
heat
Code Issues Proposed changes

Merge "Use negative timeout for convergence unittests" into stable/liberty

This commit is contained in:
Jenkins 2016-01-19 20:28:54 +00:00 committed by Gerrit Code Review
parent 1e91158429 a50eeef3e8
commit dc8ccd8ee1
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

@ -1682,7 +1682,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):
'''
@ -1783,7 +1783,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')
@ -2073,7 +2073,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)