Merge lp:~jose/charms/precise/chamilo/add-tests into lp:charms/chamilo

[José Antonio Rey]

Added tests for Chamilo, verifying that the site is up and the relation with mysql.

[Review Queue (review-queue)]

This items has failed automated testing! Results available here http://reports.vapour.ws/charm-tests/charm-bundle-test-10344-results

review: Needs Fixing (automated testing)

[Cory Johns (johnsca)]

The test looks great except that it has a timing / race condition which is causing the failure. I've created a suggested fix in this MP to your branch: https://code.launchpad.net/~johnsca/charms/precise/chamilo/add-test-review/+merge/245207

Thanks for the otherwise great test!

[lp:~jose/charms/precise/chamilo/add-tests]

19. By José Antonio Rey on 2014-12-19

Added timing/race condition to tests, thanks Cory!

[Charles Butler (lazypower)]

+1 LGTM

review: Approve

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2014-06-25 23:43:23 +0000
+++ hooks/config-changed	2014-12-19 17:36:18 +0000
@@ -47,5 +47,7 @@
     echo "$PASS" > .pass
 fi
 
-juju-log "Restarting server"
-service apache2 restart
+if [ -f .started ]; then
+    juju-log "Restarting server"
+    service apache2 restart
+fi

=== modified file 'hooks/install'
--- hooks/install	2014-06-23 05:08:55 +0000
+++ hooks/install	2014-12-19 17:36:18 +0000
@@ -3,6 +3,7 @@
 set -eux
 
 juju-log "Installing dependencies"
+apt-get update
 apt-get install -y apache2 php5 php5-mysqlnd php5-gd makepasswd mysql-client php5-intl php5-curl
 
 juju-log "Downloading Chamilo and verifying integrity"

=== modified file 'metadata.yaml'
--- metadata.yaml	2014-05-03 04:31:38 +0000
+++ metadata.yaml	2014-12-19 17:36:18 +0000
@@ -1,6 +1,6 @@
 name: chamilo
 summary: E-learning & Collaboration Suite
-maintainer: José Antonio Rey <[e-mail]>
+maintainer: Jose Antonio Rey <[e-mail]>
 description: |
   Chamilo is an open-source e-learning and content management system, aimed at
   improving access to education and knowledge globally. It is backed up by the

=== added directory 'tests'
=== added file 'tests/00-setup'
--- tests/00-setup	1970-01-01 00:00:00 +0000
+++ tests/00-setup	2014-12-19 17:36:18 +0000
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+sudo add-apt-repository ppa:juju/stable -y
+sudo apt-get update
+sudo apt-get install amulet python3-requests -y

=== added file 'tests/10-deploy'
--- tests/10-deploy	1970-01-01 00:00:00 +0000
+++ tests/10-deploy	2014-12-19 17:36:18 +0000
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+
+import amulet
+import requests
+import unittest
+import time
+
+
+class TestDeployment(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.deployment = amulet.Deployment(series='precise')
+
+        cls.deployment.add('chamilo')
+        cls.deployment.add('mysql')
+        cls.user = 'admin'
+        cls.password = 'ubuntu'
+        cls.deployment.configure('chamilo', {'user': cls.user, 'pass':
+                                 cls.password})
+        cls.deployment.relate('mysql:db', 'chamilo:db')
+        cls.deployment.expose('chamilo')
+
+        try:
+            cls.deployment.setup(timeout=900)
+            cls.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up \
+                                in time")
+        except:
+            raise
+        cls.chamilounit = cls.deployment.sentry.unit['chamilo/0']
+        cls.mysqlunit = cls.deployment.sentry.unit['mysql/0']
+        cls.domain = cls.chamilounit.info['public-address']
+        cls.deployment.configure('chamilo', {'domain': cls.domain})
+
+    def wait_for(self, callback, timeout=30):
+        start = time.time()
+        while time.time() - start < timeout:
+            if callback():
+                return True
+            time.sleep(1)
+        return False
+
+    def test_1_check_apache_status(self):
+        apache2status = 'sudo service apache2 status'
+        test = lambda: self.chamilounit.run(apache2status)[1] == 0
+        if not self.wait_for(test):
+            message = 'Apache2 does not seem to be running on %s' % self.domain
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+    def test_2_check_mysql_relation(self):
+        mysqlrelation = self.mysqlunit.relation('db', 'chamilo:db')
+        ip = mysqlrelation['host']
+        password = mysqlrelation['password']
+        user = mysqlrelation['user']
+        mysqlstatus = 'mysqladmin status -h {0} -u {1} --password={2}'.format(ip, user, password)
+        test = lambda: self.mysqlunit.run(mysqlstatus)[1] == 0
+        if not self.wait_for(test):
+            message = 'Unable to get MySQL status at %s' % ip
+            amulet.raise_status(amulet.FAIL, msg=message)
+        else:
+            print('Chamilo <-> MySQL relation verified succesfully!')
+
+    def test_3_check_chamilo_install(self):
+        def test():
+            r = requests.get('http://%s/' % self.domain)
+            if r.status_code != 200:
+                return False
+
+            return 'My Organisation' in r.text
+
+        if self.wait_for(test):
+            print('Chamilo is running on %s!' % self.domain)
+        else:
+            message = 'Unable to get the correct title for the Chamilo \
+                       instance at %s' % self.domain
+            amulet.raise_status(amulet.FAIL, msg=message)
+
+if __name__ == '__main__':
+    unittest.main()