diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 20:28:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 20:28:54 +0000 |
| commit | dc8ccd8ee15bb336c4704ac1ff628bfb245a5593 (patch) | |
| tree | 7a09ac29314584f05ae35a458bfd2f15a002aca8 /heat | |
| parent | 1e911584291cdddb85c2b8d9ffc278f3bf6ca10a (diff) | |
| parent | a50eeef3e8c8ac5df0e7ed1fe6a951f87770f915 (diff) | |
| download | heat-dc8ccd8ee15bb336c4704ac1ff628bfb245a5593.tar.gz | |
Merge "Use negative timeout for convergence unittests" into stable/liberty5.0.1
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/tests/test_resource.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index 29096277b..120c7c37f 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -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) |