Add unit tests for git-reinstall action

actions/git-reinstall

@@ -1,40 +0,0 @@
-#!/usr/bin/python
-import sys
-import traceback
-
-sys.path.append('hooks/')
-
-from charmhelpers.contrib.openstack.utils import (
-    git_install_requested,
-)
-
-from charmhelpers.core.hookenv import (
-    action_set,
-    action_fail,
-    config,
-)
-
-from keystone_utils import (
-    git_install,
-)
-
-
-def git_reinstall():
-    """Reinstall from source and restart services.
-
-    If the openstack-origin-git config option was used to install openstack
-    from source git repositories, then this action can be used to reinstall
-    from updated git repositories, followed by a restart of services."""
-    if not git_install_requested():
-        action_fail("openstack-origin-git is not configured")
-        return
-
-    try:
-        git_install(config('openstack-origin-git'))
-    except:
-        action_set({'traceback': traceback.format_exc()})
-        action_fail("git-reinstall resulted in an unexpected error")
-
-
-if __name__ == '__main__':
-    git_reinstall()

actions/git-reinstall

@@ -0,0 +1 @@
+git_reinstall.py

actions/git_reinstall.py

@@ -0,0 +1,40 @@
+#!/usr/bin/python
+import sys
+import traceback
+
+sys.path.append('hooks/')
+
+from charmhelpers.contrib.openstack.utils import (
+    git_install_requested,
+)
+
+from charmhelpers.core.hookenv import (
+    action_set,
+    action_fail,
+    config,
+)
+
+from keystone_utils import (
+    git_install,
+)
+
+
+def git_reinstall():
+    """Reinstall from source and restart services.
+
+    If the openstack-origin-git config option was used to install openstack
+    from source git repositories, then this action can be used to reinstall
+    from updated git repositories, followed by a restart of services."""
+    if not git_install_requested():
+        action_fail('openstack-origin-git is not configured')
+        return
+
+    try:
+        git_install(config('openstack-origin-git'))
+    except:
+        action_set({'traceback': traceback.format_exc()})
+        action_fail('git-reinstall resulted in an unexpected error')
+
+
+if __name__ == '__main__':
+    git_reinstall()

unit_tests/__init__.py

@@ -1,3 +1,4 @@
 import sys
 
+sys.path.append('actions/')
 sys.path.append('hooks/')

unit_tests/test_actions_git_reinstall.py

@@ -0,0 +1,86 @@
+import os
+import sys
+from mock import patch, call, MagicMock, Mock
+
+with patch('charmhelpers.core.hookenv.config') as config:
+    config.return_value = 'keystone'
+    import keystone_utils as utils
+
+import git_reinstall
+
+from test_utils import (
+    CharmTestCase
+)
+
+TO_PATCH = [
+    'config',
+]
+
+
+openstack_origin_git = \
+    """repositories:
+         - {name: requirements,
+            repository: 'git://git.openstack.org/openstack/requirements',
+            branch: stable/juno}
+         - {name: keystone,
+            repository: 'git://git.openstack.org/openstack/keystone',
+            branch: stable/juno}"""
+
+class TestKeystoneActions(CharmTestCase):
+
+    def setUp(self):
+        super(TestKeystoneActions, self).setUp(git_reinstall, TO_PATCH)
+        self.config.side_effect = self.test_config.get
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    def test_git_reinstall(self, git_install, action_fail, action_set):
+        self.test_config.set('openstack-origin-git', openstack_origin_git)
+
+        git_reinstall.git_reinstall()
+
+        git_install.assert_called_with(openstack_origin_git)
+        self.assertTrue(git_install.called)
+        self.assertFalse(action_set.called)
+        self.assertFalse(action_fail.called)
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    def test_git_reinstall_not_configured(self, _config, git_install,
+                                          action_fail, action_set):
+        _config.return_value = 'none'
+
+        git_reinstall.git_reinstall()
+
+        msg = 'openstack-origin-git is not configured'
+        action_fail.assert_called_with(msg)
+        self.assertFalse(git_install.called)
+        self.assertFalse(action_set.called)
+
+    @patch.object(git_reinstall, 'action_set')
+    @patch.object(git_reinstall, 'action_fail')
+    @patch.object(git_reinstall, 'git_install')
+    @patch('charmhelpers.contrib.openstack.utils.config')
+    def test_git_reinstall_exception(self, _config, git_install,
+                                     action_fail, action_set):
+        _config.return_value = openstack_origin_git
+        e = OSError('something bad happened')
+        git_install.side_effect = e
+        traceback = (
+        "Traceback (most recent call last):\n"
+        "  File \"actions/git_reinstall.py\", line 33, in git_reinstall\n"
+        "    git_install(config(\'openstack-origin-git\'))\n"
+        "  File \"/usr/lib/python2.7/dist-packages/mock.py\", line 964, in __call__\n"
+        "    return _mock_self._mock_call(*args, **kwargs)\n"
+        "  File \"/usr/lib/python2.7/dist-packages/mock.py\", line 1019, in _mock_call\n"
+        "    raise effect\n"
+        "OSError: something bad happened\n")
+
+        git_reinstall.git_reinstall()
+
+        msg = 'git-reinstall resulted in an unexpected error'
+        action_fail.assert_called_with(msg)
+        action_set.assert_called_with({'traceback': traceback})