openstack/heat
Code Issues Proposed changes

Look for instance name that matches template

Browse Source 
Change-Id: I8963b36fa4c4530cfec9c388c5758812d7d1bddc
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
This commit is contained in:
Jeff Peeler 2012-09-18 22:19:59 -04:00
parent cd47a395af
commit 52f5d7c7fe
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/tests/functional/test_WordPress_Single_Instance_With_EBS_EIP.py
View File

@ -36,19 +36,19 @@ class WordPressEBSEIPFunctionalTest(unittest.TestCase):
self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools', self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools',
stack_paramstr) stack_paramstr)
self.WikiDatabase = util.Instance('WikiDatabase') self.WikiServer = util.Instance('WikiServer')
def tearDown(self): def tearDown(self):
self.stack.cleanup() self.stack.cleanup()
def test_instance(self): def test_instance(self):
self.stack.create() self.stack.create()
self.WikiDatabase.wait_for_boot() self.WikiServer.wait_for_boot()
self.WikiDatabase.check_cfntools() self.WikiServer.check_cfntools()
self.WikiDatabase.wait_for_provisioning() self.WikiServer.wait_for_provisioning()
# ensure wordpress was installed # ensure wordpress was installed
self.assertTrue(self.WikiDatabase.file_present self.assertTrue(self.WikiServer.file_present
('/etc/wordpress/wp-config.php')) ('/etc/wordpress/wp-config.php'))
print "Wordpress installation detected" print "Wordpress installation detected"
@ -84,7 +84,7 @@ class WordPressEBSEIPFunctionalTest(unittest.TestCase):
self.assertTrue(ver.verify_wordpress(eip_url)) self.assertTrue(ver.verify_wordpress(eip_url))
# Check EBS volume is present and mounted # 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') 'grep vdc /proc/mounts')
result = stdout.readlines().pop().rstrip() result = stdout.readlines().pop().rstrip()
self.assertTrue(len(result)) self.assertTrue(len(result))

10
heat/tests/functional/test_WordPress_Single_Instance_With_EIP.py
View File

@ -36,19 +36,19 @@ class WordPressEIPFunctionalTest(unittest.TestCase):
self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools', self.stack = util.Stack(template, 'F17', 'x86_64', 'cfntools',
stack_paramstr) stack_paramstr)
self.WikiDatabase = util.Instance('WikiDatabase') self.WebServer = util.Instance('WebServer')
def tearDown(self): def tearDown(self):
self.stack.cleanup() self.stack.cleanup()
def test_instance(self): def test_instance(self):
self.stack.create() self.stack.create()
self.WikiDatabase.wait_for_boot() self.WebServer.wait_for_boot()
self.WikiDatabase.check_cfntools() self.WebServer.check_cfntools()
self.WikiDatabase.wait_for_provisioning() self.WebServer.wait_for_provisioning()
# ensure wordpress was installed # ensure wordpress was installed
self.assertTrue(self.WikiDatabase.file_present self.assertTrue(self.WebServer.file_present
('/etc/wordpress/wp-config.php')) ('/etc/wordpress/wp-config.php'))
print "Wordpress installation detected" print "Wordpress installation detected"