From ca2f49f282a50a3f2480ec849353f7639f1320f3 Mon Sep 17 00:00:00 2001 From: Edward Hope-Morley Date: Wed, 4 Oct 2017 19:02:26 +0100 Subject: [PATCH] Mock out calls to service_stop|start Commit 01816c8 forgot to mock out calls to service_start() and service_stop() that were added to the install hook which causes test runs to fail if not run as root. Change-Id: I07e17242356a80e32c43c289b94c650a299e16b3 --- unit_tests/test_keystone_hooks.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/unit_tests/test_keystone_hooks.py b/unit_tests/test_keystone_hooks.py index 0d34572d..602814fb 100644 --- a/unit_tests/test_keystone_hooks.py +++ b/unit_tests/test_keystone_hooks.py @@ -124,6 +124,8 @@ class KeystoneRelationTests(CharmTestCase): @patch.object(utils, 'os_release') @patch.object(utils, 'git_install_requested') @patch.object(unison, 'ensure_user') + @patch.object(hooks, 'service_stop', lambda *args: None) + @patch.object(hooks, 'service_start', lambda *args: None) def test_install_hook(self, ensure_user, git_requested, os_release): os_release.return_value = 'havana' git_requested.return_value = False @@ -145,6 +147,8 @@ class KeystoneRelationTests(CharmTestCase): @patch.object(utils, 'os_release') @patch.object(utils, 'git_install_requested') @patch.object(unison, 'ensure_user') + @patch.object(hooks, 'service_stop', lambda *args: None) + @patch.object(hooks, 'service_start', lambda *args: None) def test_install_hook_apache2(self, ensure_user, git_requested, os_release): os_release.return_value = 'havana' @@ -168,6 +172,8 @@ class KeystoneRelationTests(CharmTestCase): @patch.object(utils, 'os_release') @patch.object(utils, 'git_install_requested') @patch.object(unison, 'ensure_user') + @patch.object(hooks, 'service_stop', lambda *args: None) + @patch.object(hooks, 'service_start', lambda *args: None) def test_install_hook_git(self, ensure_user, git_requested, os_release): os_release.return_value = 'havana' git_requested.return_value = True