diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-05 23:46:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-05 23:46:32 +0000 |
| commit | 3f3a6ffa84129605d0ad0d720054eeb0aec40c2a (patch) | |
| tree | a958343c5ced0ff355f213ae00761cbae74321bf | |
| parent | 36f3721379345e321ae51d6be9984e652cda5936 (diff) | |
| parent | 97b748e65c0e9ce5ace242b72c761559e1dfb73f (diff) | |
| download | heat-3f3a6ffa84129605d0ad0d720054eeb0aec40c2a.tar.gz | |
Merge "Use region from config in functional tests" into stable/liberty
| -rw-r--r-- | heat_integrationtests/functional/test_remote_stack.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/heat_integrationtests/functional/test_remote_stack.py b/heat_integrationtests/functional/test_remote_stack.py index 91a165cb0..d7b2cdf00 100644 --- a/heat_integrationtests/functional/test_remote_stack.py +++ b/heat_integrationtests/functional/test_remote_stack.py @@ -45,6 +45,9 @@ outputs: def setUp(self): super(RemoteStackTest, self).setUp() + # replacing the template region with the one from the config + self.template = self.template.replace('RegionOne', + self.conf.region) def test_remote_stack_alone(self): stack_id = self.stack_create(template=self.remote_template) @@ -79,7 +82,7 @@ outputs: def test_stack_create_bad_region(self): stack_name = self._stack_rand_name() - tmpl_bad_region = self.template.replace('RegionOne', 'DARKHOLE') + tmpl_bad_region = self.template.replace(self.conf.region, 'DARKHOLE') files = {'remote_stack.yaml': self.remote_template} kwargs = { 'stack_name': stack_name, @@ -101,8 +104,9 @@ outputs: ex = self.assertRaises(exc.HTTPBadRequest, self.stack_create, **kwargs) error_msg = ('ERROR: Failed validating stack template using Heat ' - 'endpoint at region "RegionOne" due to ' - '"ERROR: The template section is invalid: resource"') + 'endpoint at region "%s" due to ' + '"ERROR: The template section is ' + 'invalid: resource"') % self.conf.region self.assertEqual(error_msg, six.text_type(ex)) def test_stack_update(self): |