openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Fix unit tests

Browse Source
This commit is contained in:
Liam Young 2015-03-10 09:15:51 +00:00
parent e6463bb22d
commit 6a7cc67908
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
unit_tests/test_nova_cc_hooks.py
View File

@ -58,7 +58,7 @@ TO_PATCH = [
'volume_service',
'unit_get',
'uuid',
'eligible_leader',
'is_elected_leader',
'keystone_ca_cert_b64',
'neutron_plugin',
'migrate_nova_database',
@ -191,7 +191,7 @@ class NovaCCHooksTests(CharmTestCase):
_util_config.return_value = None
self.is_relation_made.return_value = False
self.network_manager.return_value = 'neutron'
self.eligible_leader = True
self.is_elected_leader = True
self.keystone_ca_cert_b64.return_value = 'foocert64'
self.volume_service.return_value = 'cinder'
self.unit_get.return_value = 'nova-cc-host1'
@ -229,7 +229,7 @@ class NovaCCHooksTests(CharmTestCase):
napi.return_value = mock_NeutronAPIContext
self.is_relation_made.return_value = True
self.network_manager.return_value = 'neutron'
self.eligible_leader = True
self.is_elected_leader = True
self.keystone_ca_cert_b64.return_value = 'foocert64'
self.volume_service.return_value = 'cinder'
self.unit_get.return_value = 'nova-cc-host1'

8
unit_tests/test_nova_cc_utils.py
View File

@ -20,7 +20,7 @@ TO_PATCH = [
'config',
'configure_installation_source',
'disable_policy_rcd',
'eligible_leader',
'is_elected_leader',
'enable_policy_rcd',
'enable_services',
'get_os_codename_install_source',
@ -623,7 +623,7 @@ class NovaCCUtilsTests(CharmTestCase):
self.get_os_codename_install_source.side_effect = [
'havana',
'icehouse']
self.eligible_leader.return_value = True
self.is_elected_leader.return_value = True
self.relation_ids.return_value = []
utils.do_openstack_upgrade()
expected = [call(['stamp', 'grizzly']), call(['upgrade', 'head']),
@ -649,7 +649,7 @@ class NovaCCUtilsTests(CharmTestCase):
get_step_upgrade_source.return_value = None
self.os_release.return_value = 'havana'
self.get_os_codename_install_source.return_value = 'icehouse'
self.eligible_leader.return_value = True
self.is_elected_leader.return_value = True
self.relation_ids.return_value = []
utils.do_openstack_upgrade()
self.neutron_db_manage.assert_called_with(['upgrade', 'head'])
@ -672,7 +672,7 @@ class NovaCCUtilsTests(CharmTestCase):
get_step_upgrade_source.return_value = None
self.os_release.return_value = 'icehouse'
self.get_os_codename_install_source.return_value = 'juno'
self.eligible_leader.return_value = True
self.is_elected_leader.return_value = True
self.relation_ids.return_value = []
utils.do_openstack_upgrade()
neutron_db_calls = [call(['stamp', 'icehouse']),