From fd38656097f56b51d25e4e3641936d6b3f7331dd Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Tue, 4 Sep 2012 17:25:29 +0100 Subject: [PATCH] heat tests : test_WordPress_Single_Instance.py update Update test_WordPress_Single_Instance.py to use the new verify_wordpress which checks that the wordpress homepage specified in the stack output looks OK Change-Id: I9c2c35215ac97f98e62bf1787db3d8645b50c762 Signed-off-by: Steven Hardy --- .../functional/test_WordPress_Single_Instance.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/heat/tests/functional/test_WordPress_Single_Instance.py b/heat/tests/functional/test_WordPress_Single_Instance.py index 486239615b..b8ba741c99 100644 --- a/heat/tests/functional/test_WordPress_Single_Instance.py +++ b/heat/tests/functional/test_WordPress_Single_Instance.py @@ -13,6 +13,7 @@ # import util +import verify import nose from nose.plugins.attrib import attr @@ -33,11 +34,20 @@ def test_template(): ssh = func_utils.get_ssh_client() - # ensure wordpress was installed + # 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) 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") + print "Got stack output WebsiteURL=%s, verifying" % stack_url + ver = verify.VerifyStack() + assert True == ver.verify_wordpress(stack_url) + finally: func_utils.cleanup()