From d121ecbd5d8428d10e46667acaed61bb5292f7cc Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Mon, 30 Mar 2015 16:04:34 +0000 Subject: [PATCH] unit test updates --- unit_tests/test_actions_git_reinstall.py | 2 +- unit_tests/test_keystone_hooks.py | 2 +- unit_tests/test_keystone_utils.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/unit_tests/test_actions_git_reinstall.py b/unit_tests/test_actions_git_reinstall.py index 09ce0c9a..2c69993c 100644 --- a/unit_tests/test_actions_git_reinstall.py +++ b/unit_tests/test_actions_git_reinstall.py @@ -50,7 +50,7 @@ class TestKeystoneActions(CharmTestCase): @patch('charmhelpers.contrib.openstack.utils.config') def test_git_reinstall_not_configured(self, _config, git_install, action_fail, action_set): - _config.return_value = 'none' + _config.return_value = None git_reinstall.git_reinstall() diff --git a/unit_tests/test_keystone_hooks.py b/unit_tests/test_keystone_hooks.py index a80f2503..fbe9781d 100644 --- a/unit_tests/test_keystone_hooks.py +++ b/unit_tests/test_keystone_hooks.py @@ -92,7 +92,7 @@ class KeystoneRelationTests(CharmTestCase): ['haproxy', 'unison', 'python-keystoneclient', 'uuid', 'python-mysqldb', 'openssl', 'apache2', 'pwgen', 'python-six', 'keystone', 'python-psycopg2'], fatal=True) - self.git_install.assert_called_with('None') + self.git_install.assert_called_with(None) @patch.object(utils, 'git_install_requested') def test_install_hook_git(self, git_requested): diff --git a/unit_tests/test_keystone_utils.py b/unit_tests/test_keystone_utils.py index e070b8a2..4bd5ff62 100644 --- a/unit_tests/test_keystone_utils.py +++ b/unit_tests/test_keystone_utils.py @@ -119,7 +119,7 @@ class TestKeystoneUtils(CharmTestCase): @patch('charmhelpers.contrib.openstack.utils.config') def test_determine_packages(self, _config): - _config.return_value = "None" + _config.return_value = None result = utils.determine_packages() ex = utils.BASE_PACKAGES + ['keystone', 'python-keystoneclient'] self.assertEquals(set(ex), set(result))