From 52f5d7c7fed085d695089cd8fbba8b70c7142964 Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Tue, 18 Sep 2012 22:19:59 -0400 Subject: [PATCH] Look for instance name that matches template Change-Id: I8963b36fa4c4530cfec9c388c5758812d7d1bddc Signed-off-by: Jeff Peeler --- .../test_WordPress_Single_Instance_With_EBS_EIP.py | 12 ++++++------ .../test_WordPress_Single_Instance_With_EIP.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py index c61db81d46..9a1d2fa740 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py @@ -36,19 +36,19 @@ class WordPressEBSEIPFunctionalTest(unittest.TestCase): self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools', stack_paramstr) - self.WikiDatabase = util.Instance('WikiDatabase') + self.WikiServer = util.Instance('WikiServer') def tearDown(self): self.stack.cleanup() def test_instance(self): self.stack.create() - self.WikiDatabase.wait_for_boot() - self.WikiDatabase.check_cfntools() - self.WikiDatabase.wait_for_provisioning() + self.WikiServer.wait_for_boot() + self.WikiServer.check_cfntools() + self.WikiServer.wait_for_provisioning() # ensure wordpress was installed - self.assertTrue(self.WikiDatabase.file_present + self.assertTrue(self.WikiServer.file_present ('/etc/wordpress/wp-config.php')) print "Wordpress installation detected" @@ -84,7 +84,7 @@ class WordPressEBSEIPFunctionalTest(unittest.TestCase): self.assertTrue(ver.verify_wordpress(eip_url)) # Check EBS volume is present and mounted - stdin, stdout, sterr = self.WikiDatabase.exec_command( + stdin, stdout, sterr = self.WikiServer.exec_command( 'grep vdc /proc/mounts') result = stdout.readlines().pop().rstrip() self.assertTrue(len(result)) diff --git a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py index e6e18dc255..0998895a13 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py +++ b/heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py @@ -36,19 +36,19 @@ class WordPressEIPFunctionalTest(unittest.TestCase): self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools', stack_paramstr) - self.WikiDatabase = util.Instance('WikiDatabase') + self.WebServer = util.Instance('WebServer') def tearDown(self): self.stack.cleanup() def test_instance(self): self.stack.create() - self.WikiDatabase.wait_for_boot() - self.WikiDatabase.check_cfntools() - self.WikiDatabase.wait_for_provisioning() + self.WebServer.wait_for_boot() + self.WebServer.check_cfntools() + self.WebServer.wait_for_provisioning() # ensure wordpress was installed - self.assertTrue(self.WikiDatabase.file_present + self.assertTrue(self.WebServer.file_present ('/etc/wordpress/wp-config.php')) print "Wordpress installation detected"