From cbed62355cb006dabd6a160f4c9f04d423a353c0 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Wed, 23 Mar 2016 10:20:21 +0530 Subject: [PATCH] Use region from config in functional tests We seem to be using hardcoded region in some inline templates of fucntional tests. They would fail if the region name is different. This changes to use it from the config. Change-Id: Iafd1251545e00c6cba292b042352b1ef34da81e0 Closes-Bug: #1560585 --- heat_integrationtests/functional/test_remote_stack.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/heat_integrationtests/functional/test_remote_stack.py b/heat_integrationtests/functional/test_remote_stack.py index 96306ac083..b82958c852 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) @@ -78,7 +81,7 @@ outputs: self.assertEqual(remote_resources, self.list_resources(remote_id)) def test_stack_create_bad_region(self): - 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 = { 'template': tmpl_bad_region, @@ -98,8 +101,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):