From 98485bdcf4a32c32b4b50b13155eb50e25baf934 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Wed, 5 Sep 2012 14:20:19 +0100 Subject: [PATCH] heat tests : convert functional test to testcase class Covert test_WordPress_Single_Instance to be nose unittest.TestCase subclass, so run_tests.sh outputs a more informative test identifier Change-Id: I19fe8565d99253cabcbc93d2f003c69d953be615 Signed-off-by: Steven Hardy --- .../test_WordPress_Single_Instance.py | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/heat/tests/functional/test_WordPress_Single_Instance.py b/heat/tests/functional/test_WordPress_Single_Instance.py index b8ba741c..c3f57c43 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance.py +++ b/heat/tests/functional/test_WordPress_Single_Instance.py @@ -16,38 +16,39 @@ import util import verify import nose from nose.plugins.attrib import attr +import unittest @attr(speed='slow') @attr(tag=['func', 'wordpress']) -def test_template(): - try: +class WordPressFunctionalTest(unittest.TestCase): + def setUp(self): template = 'WordPress_Single_Instance.template' - func_utils = util.FuncUtils() + self.func_utils = util.FuncUtils() - func_utils.prepare_jeos('F17', 'x86_64', 'cfntools') - func_utils.create_stack(template, 'F17') - func_utils.check_cfntools() - func_utils.wait_for_provisioning() - func_utils.check_user_data(template) + self.func_utils.prepare_jeos('F17', 'x86_64', 'cfntools') + self.func_utils.create_stack(template, 'F17') + self.func_utils.check_cfntools() + self.func_utils.wait_for_provisioning() + self.func_utils.check_user_data(template) - ssh = func_utils.get_ssh_client() + self.ssh = self.func_utils.get_ssh_client() + def test_instance(self): # ensure wordpress was installed by checking for expected # configuration file over ssh wp_file = '/etc/wordpress/wp-config.php' - stdin, stdout, sterr = ssh.exec_command('ls ' + wp_file) + stdin, stdout, sterr = self.ssh.exec_command('ls ' + wp_file) result = stdout.readlines().pop().rstrip() assert result == wp_file print "Wordpress installation detected" # Verify the output URL parses as expected, ie check that # the wordpress installation is operational - stack_url = func_utils.get_stack_output("WebsiteURL") + stack_url = self.func_utils.get_stack_output("WebsiteURL") print "Got stack output WebsiteURL=%s, verifying" % stack_url ver = verify.VerifyStack() assert True == ver.verify_wordpress(stack_url) - finally: - func_utils.cleanup() + self.func_utils.cleanup() -- 2.45.2