Merge lp:~lazypower/charms/precise/owncloud/refactor_amulet_tests into lp:~jose/charms/precise/owncloud/port-change+repo+ssl-support

[Charles Butler]

refactors the tests for clarity, and to introduce a cleaner testing format.

[José Antonio Rey (jose)]

Thanks a lot for working on this, Charles. Looks good to me!

review: Approve (+1)

=== added file 'tests/100-deploy.py'
--- tests/100-deploy.py	1970-01-01 00:00:00 +0000
+++ tests/100-deploy.py	2014-05-16 20:30:30 +0000
@@ -0,0 +1,116 @@
+#!/usr/bin/env python3
+# The format of this test was shamelessly ripped from Cory Johns awesome
+# tests that resemble nosetests in the Apache Allura charm. <3
+# http://bazaar.launchpad.net/~johnsca/charms/precise/apache-allura/
+
+import amulet
+import requests
+
+
+class TestDeploy(object):
+
+    def __init__(self, time=2500):
+        # Attempt to load the deployment topology from a bundle.
+        self.deploy = amulet.Deployment()
+
+        # If something errored out, attempt to continue by
+        # manually specifying a standalone deployment
+        self.deploy.add('owncloud')
+        self.deploy.add('mysql')
+        self.deploy.add('nfs')
+        self.deploy.configure('owncloud', {'user': 'tom',
+                                           'password': 'swordfish'})
+        self.deploy.relate('owncloud:db', 'mysql:db')
+        self.deploy.relate('owncloud:shared-fs', 'nfs:nfs')
+        self.deploy.expose('owncloud')
+
+        try:
+            self.deploy.setup(time)
+            self.deploy.sentry.wait(time)
+        except:
+            amulet.raise_status(amulet.FAIL, msg="Environment standup timeout")
+        sentry = self.deploy.sentry
+
+        self.domain = sentry.unit['owncloud/0'].info['public-address']
+        self.mysql_unit = self.deploy.sentry.unit['mysql/0']
+        self.nfs_unit = self.deploy.sentry.unit['nfs/0']
+        self.app_unit = self.deploy.sentry.unit['owncloud/0']
+
+    def run(self):
+        for test in dir(self):
+            if test.startswith('test_'):
+                getattr(self, test)()
+
+    def test_standalone_http(self):
+
+        # r = requests.get("http://%s/" % domain, data, headers=h)
+        r = requests.get("https://%s/index.php" % self.domain, verify=False)
+        r.raise_for_status()
+
+        search_string = 'web services under your control'
+        if r.text.find(search_string) is -1:
+            amulet.raise_status(amulet.FAIL, msg="Unable to verify login page")
+
+    def test_database_relationship(self):
+
+        sent_config = self.mysql_unit.relation('db', 'owncloud:db')
+        # I'm sorry this is gross, and repeats itself. This is a dirty hack
+        # around owncloud not normalizing quotations, and field names.
+        try:
+            filepath = "/var/www/owncloud/config/autoconfig.php"
+            cfg = self.deploy.sentry.unit['owncloud/0'].file_contents(filepath)
+            cfg_to_check = {'dbuser': 'user', 'dbpass': 'password',
+                            'dbhost': 'host'}
+            for c_key, j_key in cfg_to_check.items():
+                if cfg.find('"%s" => "%s"' % (c_key, sent_config[j_key])) == -1:
+                    amulet.raise_status(amulet.FAIL,
+                                        msg="Unable to validate db cfg %s" % j_key)
+        except:
+            filepath = "/var/www/owncloud/config/config.php"
+            cfg = self.deploy.sentry.unit['owncloud/0'].file_contents(filepath)
+            cfg_to_check = {'dbuser': 'user', 'dbpassword': 'password',
+                            'dbhost': 'host'}
+            for c_key, j_key in cfg_to_check.items():
+                if cfg.find("'%s' => '%s'" % (c_key, sent_config[j_key])) == -1:
+                    amulet.raise_status(amulet.FAIL,
+                                        msg="Unable to validate db cfg %s" % j_key)
+
+    def term_search(self, output, term):
+        if output.find(term) == -1:
+            amulet.raise_status(amulet.FAIL,
+                                msg="Unable to validate NFS config %s" % term)
+
+    def test_nfs_relationship(self):
+        # Cache Relationship details
+        nfs_relation = self.nfs_unit.relation('nfs', 'owncloud:shared-fs')
+
+        # Leverage Amulet's exception handling if directory doesnt exist
+        # to check for the directory, as a cheap quick fail test.
+        try:
+            self.app_unit.directory('/var/lib/owncloud')
+        except:
+            amulet.raise_status(amulet.FAIL, msg="NFS Directory not found")
+
+        #Fetch the contents of mtab for data validation
+        mtab_contents = self.app_unit.file_contents('/etc/mtab')
+
+        self.term_search(mtab_contents, nfs_relation['private-address'])
+        self.term_search(mtab_contents, nfs_relation['fstype'])
+        self.term_search(mtab_contents, nfs_relation['mountpoint'])
+        self.term_search(mtab_contents, nfs_relation['options'])
+
+    def test_nfs_write_pipeline(self):
+        # Validate file write pipeline
+        #Build a $block_size file, and ship it via NFS
+        cmd_builder = "dd if=/dev/zero of=/var/lib/owncloud/amulet-file-test bs=8M count=1"
+        self.app_unit.run(cmd_builder)
+
+        filepath = '/srv/data/relation-sentry/amulet-file-test'
+        file_test = self.nfs_unit.file(filepath)
+        if file_test['size'] < 8000000:
+            amulet.raise_status(amulet.FAIL, 'File size constraint not met')
+
+
+if __name__ == '__main__':
+    runner = TestDeploy()
+    runner.run()

=== removed file 'tests/100_deploy.test'
--- tests/100_deploy.test	2014-05-08 04:28:00 +0000
+++ tests/100_deploy.test	1970-01-01 00:00:00 +0000
@@ -1,147 +0,0 @@
-#!/usr/bin/env python3
-
-import amulet
-import requests
-
-##########################################
-# Config Options
-##########################################
-scale = 2
-seconds = 1500
-user = 'tom'
-password = 'swordfish'
-block_size = "8M"
-verify_size = 8000000
-
-###########################################################
-#Deployment Setup
-############################################################
-d = amulet.Deployment()
-
-d.add('owncloud', units=scale)
-d.add('mysql')
-d.add('haproxy')
-d.add('nfs')
-d.configure('owncloud', {'user': user, 'password': password})
-d.relate('owncloud:db', 'mysql:db')
-d.relate('owncloud:website', 'haproxy:reverseproxy')
-d.relate('owncloud:shared-fs', 'nfs:nfs')
-d.expose('owncloud')
-d.expose('haproxy')
-
-
-#perform deployment
-try:
-    d.setup(timeout=seconds)
-    d.sentry.wait()
-except amulet.helpers.TimeoutError:
-    message = 'The environment did not setup in %d seconds.', seconds
-    amulet.raise_status(amulet.SKIP, msg=message)
-except:
-    raise
-
-
-#############################################################
-# Check presence of HTTP services
-#############################################################
-def validate_status_interface():
-    h = {'User-Agent': 'Mozilla/5.0 Gecko/20100101 Firefox/12.0',
-         'Content-Type': 'application/x-www-form-urlencoded',
-         'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*',
-         'Accept-Encoding': 'gzip, deflate'}
-
-    data = {'user': 'tom', 'password': 'swordfish'}
-
-    #validate the Owncloud login screen is present
-    domain = d.sentry.unit['owncloud/0'].info['public-address']
-    d.configure('owncloud', {'domain': domain})
-    r = requests.post("https://{}".format(
-        d.sentry.unit['owncloud/0'].info['public-address']),
-        data, headers=h)
-    r.raise_for_status()
-
-    #validate the HAProxy daemon is forwarding as expected
-    ocdomain = d.sentry.unit['haproxy/0'].info['public-address']
-    d.configure('owncloud', {'domain': ocdomain})
-    r = requests.get("https://{}".format(
-        d.sentry.unit['haproxy/0'].info['public-address']))
-    r.raise_for_status
-
-
-#############################################################
-# Validate that each service is running
-#############################################################
-def validate_running_services():
-    output, code = d.sentry.unit['owncloud/0'].run('service apache2 status')
-    if code != 0:
-        message = "Failed to find running Apache instance on host owncloud/0"
-        amulet.raise_status(amulet.SKIP, msg=message)
-    output, code = d.sentry.unit['mysql/0'].run('service mysql status')
-    if code != 0:
-        message = "Failed to find running MYSQL instance on host mysql/0"
-        amulet.raise_status(amulet.SKIP, msg=message)
-
-
-#############################################################
-# Validate that each service is running
-#############################################################
-def validate_owncloud_files():
-    index_status = d.sentry.unit['owncloud/0'].file_stat('/var/www/owncloud/index.php')
-    if index_status['size'] <= 0:
-        message = "Failed to find owncloud index.php"
-        amulet.raise_status(amulet.SKIP, msg=message)
-
-
-#############################################################
-# Validate database relationship
-#############################################################
-def validate_database_relationship():
-    #Connect to the sentrys and fetch the transmitted details
-    sent_config = d.sentry.unit['mysql/0'].relation('db', 'owncloud:db')
-    #Connect to owncloud's sentry and read the configuration PHP file
-    prod_config = d.sentry.unit['owncloud/0'].file_contents('/var/www/owncloud/config/config.php')
-    cfg_to_check = {'dbuser': 'user', 'dbpassword': 'password', 'dbhost': 'host'}
-
-    #Search the return string of the config for the transmit values
-    for cfg_file_key, juju_cfg_key in cfg_to_check.items():
-        if prod_config.find("'%s' => '%s'" % (cfg_file_key, sent_config[juju_cfg_key])) == -1:
-                amulet.raise_status(amulet.SKIP, msg="Unable to validate db sent %s" % juju_cfg_key)
-
-
-# Utility Method for searching output
-def nfs_term_search(output, term):
-    if output.find(term) == -1:
-        amulet.raise_status(amulet.FAIL, msg="Unable to validate NFS export mounted with %s" % term)
-
-
-###########################################################
-# Validate NFS FileSystem Existence
-###########################################################
-def validate_nfs_relationship():
-    # Cache Relationship details
-    nfs_relation = d.sentry.unit['nfs/0'].relation('nfs', 'owncloud:shared-fs')
-    # Raises an error if the directory does not exist
-    d.sentry.unit['owncloud/0'].directory('/var/lib/owncloud')
-    #Fetch the contents of mtab for data validation
-    mtab_contents = d.sentry.unit['owncloud/0'].file_contents('/etc/mtab')
-
-    nfs_term_search(mtab_contents, nfs_relation['private-address'])
-    nfs_term_search(mtab_contents, nfs_relation['fstype'])
-    nfs_term_search(mtab_contents, nfs_relation['mountpoint'])
-    nfs_term_search(mtab_contents, nfs_relation['options'])
-
-    # Validate file write pipeline
-    #Build a $block_size file, and ship it via NFS
-    cmd_builder = "dd if=/dev/zero of=/var/lib/owncloud/amulet-file-test bs=%s count=1" % block_size
-    d.sentry.unit['owncloud/0'].run(cmd_builder)
-
-    file_test = d.sentry.unit['nfs/0'].file('/srv/data/relation-sentry/amulet-file-test')
-    if file_test['size'] < verify_size:
-        amulet.raise_status(amulet.FAIL, 'File size constraint not met')
-
-
-validate_status_interface()
-validate_running_services()
-validate_owncloud_files()
-validate_database_relationship()
-validate_nfs_relationship()