openstack/charm-glance
Code Issues Proposed changes

Fix some tests.

Browse Source
This commit is contained in:
Alberto Donato 2015-08-25 17:41:24 +03:00
parent 28f275ea26
commit 6876c23774
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
unit_tests/test_glance_utils.py
View File

@ -4,7 +4,9 @@ from collections import OrderedDict
import os import os
os.environ['JUJU_UNIT_NAME'] = 'glance' os.environ['JUJU_UNIT_NAME'] = 'glance'
import hooks.glance_utils as utils
with patch('charmhelpers.core.hookenv.config') as config:
import hooks.glance_utils as utils
from test_utils import ( from test_utils import (
CharmTestCase, CharmTestCase,
@ -131,16 +133,16 @@ class TestGlanceUtils(CharmTestCase):
]) ])
self.assertEquals(ex_map, utils.restart_map()) self.assertEquals(ex_map, utils.restart_map())
@patch('charmhelpers.contrib.openstack.utils.config') @patch.object(utils, 'git_install_requested')
def test_determine_packages(self, _config): def test_determine_packages(self, git_install_requested):
_config.return_value = None git_install_requested.return_value = False
result = utils.determine_packages() result = utils.determine_packages()
ex = utils.PACKAGES ex = utils.PACKAGES
self.assertEquals(set(ex), set(result)) self.assertEquals(set(ex), set(result))
@patch('charmhelpers.contrib.openstack.utils.config') @patch.object(utils, 'git_install_requested')
def test_determine_packages_git(self, _config): def test_determine_packages_git(self, git_install_requested):
_config.return_value = openstack_origin_git git_install_requested.return_value = True
result = utils.determine_packages() result = utils.determine_packages()
ex = utils.PACKAGES + utils.BASE_GIT_PACKAGES ex = utils.PACKAGES + utils.BASE_GIT_PACKAGES
for p in utils.GIT_PACKAGE_BLACKLIST: for p in utils.GIT_PACKAGE_BLACKLIST: