Merge lp:~marcoceppi/charms/precise/chamilo/unit-tests into lp:~johnsca/charms/precise/chamilo/services-framework

[Marco Ceppi]

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2014-09-09 20:31:25 +0000
@@ -0,0 +1,3 @@
+venv
+*.pyc
+.coverage

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2014-09-09 20:31:25 +0000
@@ -0,0 +1,60 @@
+PY := venv/bin/python
+# If the bin version does not exist look in venv/local/bin
+ifeq ($(wildcard venv/bin/pip),)
+  PIP = venv/local/bin/pip
+else
+  PIP = venv/bin/pip
+endif
+# If the bin version does not exist look in venv/local/bin
+NOSE = venv/bin/nosetests
+# ###########
+# Build
+# ###########
+
+.PHONY: install
+install: venv test_deps
+
+venv: $(PY)
+$(PY):
+	virtualenv venv
+
+test_deps: $(PY)
+	$(PIP) install nose coverage mock pyyaml -e bzr+lp:~johnsca/charm-helpers/contexts#egg=charmhelpers
+
+.PHONY: clean_all
+clean_all: clean clean_venv clean_db
+
+.PHONY: clean_venv
+clean_venv:
+	rm -rf venv
+
+.PHONY: clean
+clean:
+	find . -name '*.pyc' -delete
+	find . -name '*.bak' -delete
+	rm -f .coverage
+
+.PHONY: sysdeps
+sysdeps:
+	sudo apt-get $(shell tty -s || echo -y) install python3-dev virtualenv
+
+.PHONY: test
+test: unit_test
+
+unit_test: $(NOSE)
+	@$(NOSE) --nologcapture
+
+.PHONY: coverage
+coverage: $(NOSE)
+	@echo Testing with coverage...
+	@$(NOSE) --nologcapture --with-coverage --cover-package=hooks
+
+.PHONY: lint
+lint:
+	@find $(sources) -type f \( -iname '*.py' ! -iname '__init__.py' ! -iwholename '*venv/*' \) -print0 | xargs -r0 flake8
+
+.PHONY: check
+check: test lint
+
+.PHONY: all
+all: clean venv coverage lint

=== added file 'hooks/__init__.py'
=== modified file 'hooks/actions.py'
--- hooks/actions.py	2014-09-09 16:51:01 +0000
+++ hooks/actions.py	2014-09-09 20:31:25 +0000
@@ -1,4 +1,5 @@
 import subprocess
+
 from charmhelpers.core import hookenv
 from charmhelpers.core.services import helpers
 
@@ -10,15 +11,10 @@
     config = hookenv.config()
     if config.previous('db_initialized'):
         return
+
     mysql = helpers.MysqlRelation()[0]['mysql']
     with open('data/chamilo-default-db.sql') as sql:
-        subprocess.check_call([
-            'mysql',
-            '-u{}'.format(mysql['user']),
-            '-p{}'.format(mysql['password']),
-            '-h', mysql['host'],
-            mysql['database'],
-        ], stdin=sql)
+        exec_sql(sql, mysql)
     config['db_initialized'] = True
     config.save()
 
@@ -30,23 +26,29 @@
     config = hookenv.config()
     mysql = helpers.MysqlRelation()[0]['mysql']
     if config.changed('user'):
-        subprocess.check_call([
-            'mysql',
-            '-u{}'.format(mysql['user']),
-            '-p{}'.format(mysql['password']),
-            '-h', mysql['host'],
-            mysql['database'],
-            '-e', "UPDATE user SET username = '%s' "
-                  "WHERE user_id = 1;".format(config['user']),
-        ])
+        exec_sql("UPDATE user SET username = '%s' "
+                 "WHERE user_id = 1;".format(config['user']), mysql)
 
     if config.changed('pass'):
-        subprocess.check_call([
-            'mysql',
-            '-u{}'.format(mysql['user']),
-            '-p{}'.format(mysql['password']),
-            '-h', mysql['host'],
-            mysql['database'],
-            '-e', "UPDATE user SET password = SHA1('{}') "
-                  "WHERE user_id = 1;".format(config['pass']),
-        ])
+        exec_sql("UPDATE user SET password = SHA1('{}') "
+                 "WHERE user_id = 1;".format(config['pass']), mysql)
+
+
+def exec_sql(sql, mysql_cfg):
+    """
+    Execute SQL against a MySQL instance
+    """
+    sql_cmd = [
+        'mysql',
+        '-u{}'.format(mysql_cfg['user']),
+        '-p{}'.format(mysql_cfg['password']),
+        '-h', mysql_cfg['host'],
+        mysql_cfg['database'],
+    ]
+
+    if not hasattr(sql, 'read'):
+        sql_cmd.extend(['-e', sql])
+        stdin = None
+    else:
+        stdin = sql
+    subprocess.check_call(sql_cmd, stdin=stdin)

=== modified file 'hooks/services.py'
--- hooks/services.py	2014-09-09 16:51:01 +0000
+++ hooks/services.py	2014-09-09 20:31:25 +0000
@@ -24,7 +24,8 @@
             ],
             'data_ready': [
                 helpers.render_template(source='data/configuration.php',
-                                        target='/var/www/main/inc/conf/configuration.php'),
+                                        target="/var/www/main/inc/conf/"
+                                               "configuration.php"),
                 actions.init_database,
                 actions.update_admin_account,
             ],

=== added directory 'tests'
=== added file 'tests/test_actions.py'
--- tests/test_actions.py	1970-01-01 00:00:00 +0000
+++ tests/test_actions.py	2014-09-09 20:31:25 +0000
@@ -0,0 +1,99 @@
+import os
+import shutil
+import tempfile
+import unittest
+import StringIO
+import contextlib
+
+from mock import patch
+from hooks import actions
+
+from charmhelpers.core.hookenv import Config
+
+MYSQL_CFG = {
+    'user': '__user',
+    'password': 'pass',
+    'host': '0.0.0.0',
+    'port': 3306,
+    'database': 'test'
+}
+
+
[e-mail]
+def charm_dir():
+    temp_dir = tempfile.mkdtemp()
+    with patch.dict(os.environ, {'CHARM_DIR': temp_dir}):
+    	yield
+    shutil.rmtree(temp_dir)
+
+
+class TestHelpers(unittest.TestCase):
+    @patch('hooks.actions.subprocess.check_call')
+    def test_exec_sql_string(self, mchk):
+        actions.exec_sql('SELECT * FROM Something', MYSQL_CFG)
+        mchk.assert_called_with([
+            'mysql',
+            '-u__user',
+            '-ppass',
+            '-h', '0.0.0.0',
+            'test',
+            '-e', 'SELECT * FROM Something',
+        ], stdin=None)
+
+    @patch('hooks.actions.subprocess.check_call')
+    def test_exec_sql_file(self, mchk):
+        sql_file = StringIO.StringIO('SELECT * FROM Something')
+        actions.exec_sql(sql_file, MYSQL_CFG)
+        mchk.assert_called_with([
+            'mysql',
+            '-u__user',
+            '-ppass',
+            '-h', '0.0.0.0',
+            'test',
+        ], stdin=sql_file)
+
+    @patch('hooks.actions.hookenv.config')
+    def test_init_database_initd(self, mcfg):
+        sql_file = StringIO.StringIO('SELECT * FROM Something')
+
+        with charm_dir():
+            config = Config()
+            config._prev_dict = {'db_initialized': True}
+            mcfg.return_value = config
+            actions.init_database('foo')
+
+    @patch('hooks.actions.hookenv.config')
+    @patch('hooks.actions.helpers.MysqlRelation')
+    @patch('hooks.actions.exec_sql')
+    def test_init_database(self, mexc, mrel, mcfg):
+        mrel.return_value = [{'mysql': MYSQL_CFG}]
+
+        with charm_dir():
+            mcfg.return_value = Config()
+            actions.init_database('foo')
+            self.assertEqual(True, mcfg.return_value['db_initialized'])
+            mexc.assert_called_once()
+
+    @patch('hooks.actions.hookenv.config')
+    @patch('hooks.actions.helpers.MysqlRelation')
+    @patch('hooks.actions.exec_sql')
+    def test_uodate_admin_acct(self, mexc, mrel, mcfg):
+        mrel.return_value = [{'mysql': MYSQL_CFG}]
+
+        with charm_dir():
+            mcfg.return_value = Config({'user': 'what', 'pass': 'going on'})
+            actions.update_admin_account('foo')
+            mexc.assert_not_called()
+
+    @patch('hooks.actions.hookenv.config')
+    @patch('hooks.actions.helpers.MysqlRelation')
+    @patch('hooks.actions.exec_sql')
+    def test_uodate_admin_no_change(self, mexc, mrel, mcfg):
+        mrel.return_value = [{'mysql': MYSQL_CFG}]
+
+        with charm_dir():
+            config = Config({'pass': 'hey', 'user': 'hey'})
+            config._prev_dict = {'pass': 'hey', 'user': 'hey'}
+            mcfg.return_value = config
+            actions.init_database('foo')
+            mexc.assert_called()