Merge ~addyess/charm-thruk-agent:bug/1887602 into charm-thruk-agent:master

[Adam Dyess]

[Adam Dyess (addyess)]

CI Results: https://paste.ubuntu.com/p/8Nv4XnJb2z/

[Chris Sanders (chris.sanders)]

one comment inline

review: Needs Fixing

[Chris Sanders (chris.sanders)]

lgtm

review: Approve

diff --git a/hooks/actions.py b/hooks/actions.py
index 00f8eb5..f5f728b 100644
--- a/hooks/actions.py
+++ b/hooks/actions.py
@@ -6,6 +6,7 @@ import stat
 import subprocess
 import sys
 
+
 from charmhelpers.core import hookenv
 from charmhelpers.fetch import (
     add_source, apt_install, apt_update,
diff --git a/hooks/setup.py b/hooks/setup.py
index a222cb3..433e5b5 100644
--- a/hooks/setup.py
+++ b/hooks/setup.py
@@ -9,8 +9,7 @@ def install_charmhelpers():
         import enum  # noqa
     except ImportError:
         import subprocess
-        subprocess.check_call(['apt-get', 'install', '-y', 'python-pip'])
-        subprocess.check_call(['pip', 'install', 'enum34'])
+        subprocess.check_call(['apt-get', 'install', '-y', 'python-enum34'])
 
     try:
         import charmhelpers  # noqa
diff --git a/hooks/upgrade-charm b/hooks/upgrade-charm
index 9416ca6..d378ed9 120000
--- a/hooks/upgrade-charm
+++ b/hooks/upgrade-charm
@@ -1 +1 @@
-hooks.py
\ No newline at end of file
+upgrade_charm.py
\ No newline at end of file
diff --git a/hooks/upgrade_charm.py b/hooks/upgrade_charm.py
new file mode 100755
index 0000000..195e5ec
--- /dev/null
+++ b/hooks/upgrade_charm.py
@@ -0,0 +1,14 @@
+#!/usr/bin/python
+
+import sys
+
+import setup
+setup.pre_install()
+
+from hooks import hookenv, hooks   # noqa: E402, I100
+
+if __name__ == '__main__':
+    try:
+        hooks.execute(sys.argv)
+    except hookenv.UnregisteredHookError as e:
+        hookenv.log('Unknown hook {} - skipping.'.format(e))
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
new file mode 100644
index 0000000..0f063b7
--- /dev/null
+++ b/tests/unit/conftest.py
@@ -0,0 +1,5 @@
+import sys
+from pkg_resources import resource_filename
+
+# allow importing actions from the hooks directory
+sys.path.append(resource_filename(__name__, '../../hooks'))
diff --git a/tests/unit/test_actions.py b/tests/unit/test_actions.py
index 52ba4cd..5f5f3f3 100755
--- a/tests/unit/test_actions.py
+++ b/tests/unit/test_actions.py
@@ -1,25 +1,12 @@
 #!/usr/bin/env python
 
-import sys
 import unittest
 import unittest.mock as mock
-
-from pkg_resources import resource_filename
-
-# allow importing actions from the hooks directory
-sys.path.append(resource_filename(__name__, '../../hooks'))
 import actions  # noqa
 
 
-class TestActions(unittest.TestCase):
-    """Tests for charm actions."""
-
-    @mock.patch('charmhelpers.core.hookenv.log')
-    def test_log_start(self, log):
-        """Test the log-start action."""
-        actions.log_start('test-service')
-        log.assert_called_once_with('thruk-agent starting')
-
-
-if __name__ == '__main__':
-    unittest.main()
[e-mail]('charmhelpers.core.hookenv.log')
+def test_log_start(log):
+    """Test the log-start action."""
+    actions.log_start('test-service')
+    log.assert_called_once_with('thruk-agent starting')