unit test updates

This commit is contained in:
Corey Bryant 2015-03-30 16:04:34 +00:00
parent fc62b0fb64
commit d121ecbd5d
3 changed files with 3 additions and 3 deletions

View File

@ -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()

View File

@ -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):

View File

@ -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))