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

Update unittests

Browse Source 
Drop the use of the pattern "self.assertTrue([...].called)" in favor
"[...].assert_called()"

Change-Id: I6546623d043c4bde14b8532fa9125f8a12db280d
This commit is contained in:
Felipe Reyes 2023-03-22 15:02:28 -03:00
parent d3f30c4d8f
commit 89b94fe7f5
3 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unit_tests/test_actions_openstack_upgrade.py
View File

@ -58,11 +58,11 @@ class TestNovaCCUpgradeActions(CharmTestCase):
openstack_upgrade.openstack_upgrade()
self.assertTrue(self.do_openstack_upgrade.called, config.mock_calls)
self.do_openstack_upgrade.assert_called()
self.neutron_api_relation_joined.assert_called_with(
rid='relid1', remote_restart=True)
self.db_joined.assert_called_with(relation_id='relid1')
self.assertTrue(self.config_changed.called)
self.config_changed.assert_called()
# upgrade from stein without placement related
os_release.return_value = 'stein'
@ -72,7 +72,7 @@ class TestNovaCCUpgradeActions(CharmTestCase):
openstack_upgrade.openstack_upgrade()
self.assertFalse(self.do_openstack_upgrade.called)
self.do_openstack_upgrade.assert_not_called()
@patch('charmhelpers.contrib.openstack.utils.os_release')
@patch('charmhelpers.contrib.openstack.utils.config')
@ -86,5 +86,5 @@ class TestNovaCCUpgradeActions(CharmTestCase):
openstack_upgrade.openstack_upgrade()
self.assertFalse(self.do_openstack_upgrade.called)
self.assertFalse(self.config_changed.called)
self.do_openstack_upgrade.assert_not_called()
self.config_changed.assert_not_called()

114
unit_tests/test_nova_cc_hooks.py
View File

@ -135,8 +135,8 @@ class NovaCCHooksTests(CharmTestCase):
hooks.install()
self.apt_install.assert_called_with(
['nova-scheduler', 'nova-api-ec2'], fatal=True)
self.assertTrue(self.execd_preinstall.called)
self.assertTrue(self.service_pause.called)
self.execd_preinstall.assert_called()
self.service_pause.assert_called()
@patch.object(utils, 'set_shared_metadatasecret')
@patch.object(utils, 'get_shared_metadatasecret')
@ -163,9 +163,9 @@ class NovaCCHooksTests(CharmTestCase):
self.os_release.return_value = 'diablo'
hooks.resolve_CONFIGS()
hooks.config_changed()
self.assertTrue(self.save_script_rc.called)
self.save_script_rc.assert_called()
mock_filter_packages.assert_called_with([])
self.assertTrue(mock_update_aws_compat_services.called)
mock_update_aws_compat_services.assert_called()
@patch.object(utils, 'set_shared_metadatasecret')
@patch.object(utils, 'get_shared_metadatasecret')
@ -195,10 +195,10 @@ class NovaCCHooksTests(CharmTestCase):
# probably need the with patch.object from below
with patch.object(hooks.CONFIGS, 'write_all') as wa:
hooks.config_changed()
self.assertTrue(wa.called)
self.assertTrue(self.save_script_rc.called)
wa.assert_called()
self.save_script_rc.assert_called()
mock_filter_packages.assert_called_with([])
self.assertTrue(mock_update_aws_compat_services.called)
mock_update_aws_compat_services.assert_called()
mock_set_shared_metadatasecret.assert_called_once_with()
@patch.object(utils, 'set_shared_metadatasecret')
@ -225,10 +225,10 @@ class NovaCCHooksTests(CharmTestCase):
hooks.resolve_CONFIGS()
with patch.object(hooks.CONFIGS, 'write_all') as wa:
hooks.config_changed()
self.assertTrue(wa.called)
self.assertTrue(self.save_script_rc.called)
wa.assert_called()
self.save_script_rc.assert_called()
mock_filter_packages.assert_called_with([])
self.assertTrue(mock_update_aws_compat_services.called)
mock_update_aws_compat_services.assert_called()
self.service_pause.assert_called_with('neutron-server')
@patch.object(utils, 'set_shared_metadatasecret')
@ -261,9 +261,9 @@ class NovaCCHooksTests(CharmTestCase):
hooks.resolve_CONFIGS()
with patch.object(hooks.CONFIGS, 'write_all'):
hooks.config_changed()
self.assertTrue(self.save_script_rc.called)
self.save_script_rc.assert_called()
mock_filter_packages.assert_called_with([])
self.assertTrue(mock_update_aws_compat_services.called)
mock_update_aws_compat_services.assert_called()
self.service_pause.assert_called_with('neutron-server')
@patch.object(utils, 'set_shared_metadatasecret')
@ -311,23 +311,23 @@ class NovaCCHooksTests(CharmTestCase):
self.os_release.return_value = 'diablo'
hooks.resolve_CONFIGS()
hooks.config_changed()
self.assertTrue(self.do_openstack_upgrade.called)
self.assertTrue(neutron_api_joined.called)
self.assertTrue(identity_joined.called)
self.assertTrue(cluster_joined.called)
self.assertTrue(db_joined.called)
self.assertTrue(self.save_script_rc.called)
self.do_openstack_upgrade.assert_called()
neutron_api_joined.assert_called()
identity_joined.assert_called()
cluster_joined.assert_called()
db_joined.assert_called()
self.save_script_rc.assert_called()
mock_filter_packages.assert_called_with([])
self.assertTrue(mock_quantum_joined.called)
self.assertTrue(mock_update_aws_compat_services.called)
mock_quantum_joined.assert_called()
mock_update_aws_compat_services.assert_called()
# test upgrade from stein->train without placement related
self.do_openstack_upgrade.return_value = None
self.os_release.return_value = 'stein'
self.save_script_rc.reset_mock()
hooks.config_changed()
self.assertTrue(self.do_openstack_upgrade.called)
self.assertFalse(self.save_script_rc.called)
self.do_openstack_upgrade.assert_called()
self.save_script_rc.assert_not_called()
@patch.object(utils, 'set_shared_metadatasecret')
@patch.object(utils, 'get_shared_metadatasecret')
@ -367,7 +367,7 @@ class NovaCCHooksTests(CharmTestCase):
[call('generic_rid')])
mock_compute_joined.assert_has_calls(
[call(rid='generic_rid', remote_restart=False)])
self.assertTrue(mock_update_aws_compat_services.called)
mock_update_aws_compat_services.assert_called()
@patch.object(hooks, 'add_hosts_to_cell_when_ready')
@patch.object(hooks, 'set_region_on_relation_from_config')
@ -656,11 +656,11 @@ class NovaCCHooksTests(CharmTestCase):
mock_is_db_initialised.return_value = True
mock_is_cellv2_init_ready.return_value = True
hooks.add_hosts_to_cell_when_ready()
self.assertTrue(self.is_leader.called)
self.assertTrue(mock_is_db_initialised.called)
self.assertTrue(mock_is_cellv2_init_ready.called)
self.assertTrue(self.is_db_maintenance_mode.called)
self.assertTrue(mock_add_hosts_to_cell.called)
self.is_leader.assert_called()
mock_is_db_initialised.assert_called()
mock_is_cellv2_init_ready.assert_called()
self.is_db_maintenance_mode.assert_called()
mock_add_hosts_to_cell.assert_called()
@patch('hooks.nova_cc_utils.is_cellv2_init_ready')
@patch('hooks.nova_cc_utils.is_db_initialised')
@ -673,11 +673,11 @@ class NovaCCHooksTests(CharmTestCase):
mock_is_db_initialised.return_value = True
mock_is_cellv2_init_ready.return_value = True
hooks.add_hosts_to_cell_when_ready()
self.assertTrue(self.is_leader.called)
self.assertFalse(mock_is_db_initialised.called)
self.assertFalse(mock_is_cellv2_init_ready.called)
self.assertFalse(self.is_db_maintenance_mode.called)
self.assertFalse(mock_add_hosts_to_cell.called)
self.is_leader.assert_called()
mock_is_db_initialised.assert_not_called()
mock_is_cellv2_init_ready.assert_not_called()
self.is_db_maintenance_mode.assert_not_called()
mock_add_hosts_to_cell.assert_not_called()
@patch('hooks.nova_cc_utils.is_cellv2_init_ready')
@patch('hooks.nova_cc_utils.is_db_initialised')
@ -690,11 +690,11 @@ class NovaCCHooksTests(CharmTestCase):
mock_is_cellv2_init_ready.return_value = True
self.is_db_maintenance_mode.return_value = True
hooks.add_hosts_to_cell_when_ready()
self.assertTrue(self.is_leader.called)
self.assertTrue(mock_is_db_initialised.called)
self.assertTrue(mock_is_cellv2_init_ready.called)
self.assertTrue(self.is_db_maintenance_mode.called)
self.assertFalse(mock_add_hosts_to_cell.called)
self.is_leader.assert_called()
mock_is_db_initialised.assert_called()
mock_is_cellv2_init_ready.assert_called()
self.is_db_maintenance_mode.assert_called()
mock_add_hosts_to_cell.assert_not_called()
@patch('charmhelpers.contrib.openstack.ip.canonical_url')
@patch.object(hooks, '_auth_config')
@ -850,7 +850,7 @@ class NovaCCHooksTests(CharmTestCase):
self.is_clustered.return_value = False
self.test_config.set('vip', '10.0.0.10')
hooks.identity_joined()
self.assertFalse(self.relation_set.called)
self.relation_set.assert_not_called()
@patch.object(utils, 'resource_map')
@patch.object(hooks, 'CONFIGS')
@ -880,8 +880,8 @@ class NovaCCHooksTests(CharmTestCase):
'No database migration is attempted when ACL list is not present'
self.os_release.return_value = 'diablo'
self._shared_db_test(configs)
self.assertTrue(configs.write_all.called)
self.assertFalse(self.migrate_nova_databases.called)
configs.write_all.assert_called()
self.migrate_nova_databases.assert_not_called()
@patch.object(utils, 'resource_map')
@patch('hooks.nova_cc_utils.is_db_initialised')
@ -898,7 +898,7 @@ class NovaCCHooksTests(CharmTestCase):
self.os_release.return_value = 'diablo'
self.is_leader.return_value = True
self._shared_db_test(configs)
self.assertTrue(configs.write_all.called)
configs.write_all.assert_called()
self.migrate_nova_databases.assert_called_with()
@patch.object(utils, 'resource_map')
@ -915,8 +915,8 @@ class NovaCCHooksTests(CharmTestCase):
self.local_unit.return_value = 'nova-cloud-controller/1'
self.os_release.return_value = 'diablo'
self._shared_db_test(configs)
self.assertTrue(configs.write_all.called)
self.assertFalse(self.migrate_nova_databases.called)
configs.write_all.assert_called()
self.migrate_nova_databases.assert_not_called()
@patch.object(utils, 'resource_map')
@patch.object(hooks, 'quantum_joined')
@ -958,7 +958,7 @@ class NovaCCHooksTests(CharmTestCase):
configs.write = MagicMock()
self.relation_ids.return_value = ['nova-cell-api/0']
hooks.relation_broken()
self.assertTrue(configs.write_all.called)
configs.write_all.assert_called()
@patch.object(hooks, 'update_child_cell_records')
@patch.object(utils, 'resource_map')
@ -1028,7 +1028,7 @@ class NovaCCHooksTests(CharmTestCase):
_canonical_url.return_value = 'http://novaurl'
self.uuid.uuid4.return_value = 'bob'
hooks.neutron_api_relation_joined(remote_restart=True)
self.assertTrue(_identity_joined.called)
_identity_joined.assert_called()
self.relation_set.assert_called_with(relation_id=None,
nova_url=nova_url,
restart_trigger='bob')
@ -1041,9 +1041,9 @@ class NovaCCHooksTests(CharmTestCase):
_compute_joined = self.patch('compute_joined')
_quantum_joined = self.patch('quantum_joined')
hooks.neutron_api_relation_changed()
self.assertTrue(configs.write.called_with('/etc/nova/nova.conf'))
self.assertTrue(_compute_joined.called)
self.assertTrue(_quantum_joined.called)
configs.write.assert_called_with('/etc/nova/nova.conf')
_compute_joined.assert_called()
_quantum_joined.assert_called()
@patch.object(utils, 'resource_map')
@patch.object(os, 'remove')
@ -1057,9 +1057,9 @@ class NovaCCHooksTests(CharmTestCase):
_compute_joined = self.patch('compute_joined')
_quantum_joined = self.patch('quantum_joined')
hooks.neutron_api_relation_broken()
self.assertTrue(configs.write_all.called)
self.assertTrue(_compute_joined.called)
self.assertTrue(_quantum_joined.called)
configs.write_all.assert_called()
_compute_joined.assert_called()
_quantum_joined.assert_called()
@patch.object(utils, 'resource_map')
@patch('charmhelpers.contrib.openstack.ip.canonical_url')
@ -1207,7 +1207,7 @@ class NovaCCHooksTests(CharmTestCase):
@patch('hooks.nova_cc_utils.disable_deprecated_nova_placement_apache_site')
def test_placement_joined(self, disable_nova_placement):
hooks.placement_relation_joined()
self.assertTrue(disable_nova_placement.called)
disable_nova_placement.assert_called()
self.relation_set.assert_called_with(nova_placement_disabled=True,
relation_id=None)
@ -1221,10 +1221,10 @@ class NovaCCHooksTests(CharmTestCase):
self.services.return_value = ['dummy-service']
self.relation_ids.return_value = ['generic_rid']
hooks.placement_relation_changed()
self.assertTrue(self.service_restart.called)
self.assertTrue(configs.write_all.called)
self.assertTrue(identity_joined.called)
self.assertTrue(compute_joined.called)
self.service_restart.assert_called()
configs.write_all.assert_called()
identity_joined.assert_called()
compute_joined.assert_called()
@patch.object(hooks, 'memcached_common')
def test_memcache_joined(self, _memcached_common):

62
unit_tests/test_nova_cc_utils.py
View File

@ -67,7 +67,7 @@ TO_PATCH = [
]
SCRIPTRC_ENV_VARS = {
'OPENSTACK_PORT_MCASTPORT': 5404,
'OPENSTACK_PORT_MASTPORT': 5404,
'OPENSTACK_SERVICE_API_EC2': 'nova-api-ec2',
'OPENSTACK_SERVICE_API_OS_COMPUTE': 'nova-api-os-compute',
'OPENSTACK_SERVICE_CERT': 'nova-cert',
@ -724,8 +724,8 @@ class NovaCCUtilsTests(CharmTestCase):
host_key.return_value = '|1|= fookey'
with patch_open() as (_open, _file):
utils.add_known_host('foohost', 'aservice')
self.assertFalse(rm.called)
self.assertFalse(_file.write.called)
rm.assert_not_called()
_file.write.assert_not_called()
@patch.object(utils, 'known_hosts')
@patch.object(utils, 'remove_known_host')
@ -750,7 +750,7 @@ class NovaCCUtilsTests(CharmTestCase):
with patch_open() as (_open, _file):
_file.write = MagicMock()
utils.add_known_host('foohost', 'aservice')
self.assertFalse(rm.called)
rm.assert_not_called()
_file.write.assert_called_with('|1|= fookey\n')
@patch('charmhelpers.contrib.openstack.cert_utils.'
@ -1001,7 +1001,7 @@ class NovaCCUtilsTests(CharmTestCase):
self.services.return_value = ['dummy-service']
utils.migrate_nova_databases()
check_output.assert_called_with(['nova-manage', 'db', 'sync'])
self.assertTrue(self.service_resume.called)
self.service_resume.assert_called()
@patch('subprocess.check_output')
def test_migrate_nova_databases_cluster(self, check_output):
@ -1015,7 +1015,7 @@ class NovaCCUtilsTests(CharmTestCase):
self.assertNotIn(call(['nova-manage', 'db', 'online_data_migrations']),
check_output.mock_calls)
self.peer_store.assert_called_with('dbsync_state', 'complete')
self.assertTrue(self.service_resume.called)
self.service_resume.assert_called()
@patch('subprocess.check_output')
def test_migrate_nova_databases_mitaka(self, check_output):
@ -1031,7 +1031,7 @@ class NovaCCUtilsTests(CharmTestCase):
call(['nova-manage', 'db', 'online_data_migrations']),
])
self.peer_store.assert_called_with('dbsync_state', 'complete')
self.assertTrue(self.service_resume.called)
self.service_resume.assert_called()
@patch('subprocess.Popen')
@patch('subprocess.check_output')
@ -1069,7 +1069,7 @@ class NovaCCUtilsTests(CharmTestCase):
'--max-count', '50000'], stdout=-1)
Popen.assert_has_calls([map_call])
self.peer_store.assert_called_with('dbsync_state', 'complete')
self.assertTrue(self.service_resume.called)
self.service_resume.assert_called()
@patch('subprocess.Popen')
@patch('subprocess.check_output')
@ -1099,7 +1099,7 @@ class NovaCCUtilsTests(CharmTestCase):
'c83121db-f1c7-464a-b657-38c28fac84c6'])
self.assertFalse(map_call in Popen.call_args_list)
self.peer_store.assert_called_with('dbsync_state', 'complete')
self.assertTrue(self.service_resume.called)
self.service_resume.assert_called()
@patch('subprocess.check_output')
def test_migrate_nova_flavors(self, check_output):
@ -1195,7 +1195,7 @@ class NovaCCUtilsTests(CharmTestCase):
dist=True)
self.apt_install.assert_called_with(determine_packages(), fatal=True)
self.register_configs.assert_called_with(release='mitaka')
self.assertFalse(migrate_nova_databases.called)
migrate_nova_databases.assert_not_called()
database_setup.assert_called_with(prefix='novaapi')
@patch.object(utils, 'online_data_migrations_if_needed')
@ -1226,7 +1226,7 @@ class NovaCCUtilsTests(CharmTestCase):
dist=True)
self.apt_install.assert_called_with(determine_packages(), fatal=True)
self.register_configs.assert_called_with(release='rocky')
self.assertFalse(migrate_nova_databases.called)
migrate_nova_databases.assert_not_called()
database_setup.assert_called_with(prefix='novaapi')
online_data_migrations_if_needed.assert_called_once()
disable_package_apache_site.assert_called_once()
@ -1238,7 +1238,7 @@ class NovaCCUtilsTests(CharmTestCase):
utils.do_openstack_upgrade(self.register_configs())
self.assertFalse(self.apt_update.called)
self.apt_update.assert_not_called()
# test upgrade from stein->train with placement related
self.os_release.return_value = 'stein'
@ -1248,7 +1248,7 @@ class NovaCCUtilsTests(CharmTestCase):
utils.do_openstack_upgrade(self.register_configs())
self.assertTrue(self.apt_update.called)
self.apt_update.assert_called()
def test_guard_map_nova(self):
self.relation_ids.return_value = []
@ -1298,8 +1298,8 @@ class NovaCCUtilsTests(CharmTestCase):
def dummy_func():
pass
dummy_func()
self.assertFalse(self.service_running.called)
self.assertFalse(contexts.complete_contexts.called)
self.service_running.assert_not_called()
contexts.complete_contexts.assert_not_called()
def test_service_guard_active_guard(self):
'''Ensure services with incomplete interfaces are stopped'''
@ -1339,8 +1339,8 @@ class NovaCCUtilsTests(CharmTestCase):
pass
dummy_func()
self.assertFalse(self.service_running.called)
self.assertFalse(self.service_stop.called)
self.service_running.assert_not_called()
self.service_stop.assert_not_called()
self.assertTrue(_mc.called)
def test_service_guard_active_with_guardmap_function_object(self):
@ -1361,8 +1361,8 @@ class NovaCCUtilsTests(CharmTestCase):
pass
dummy_func()
self.assertFalse(self.service_running.called)
self.assertFalse(self.service_stop.called)
self.service_running.assert_not_called()
self.service_stop.assert_not_called()
self.assertTrue(_mc.called)
def test_service_guard_active_with_contexts_function_object(self):
@ -1383,8 +1383,8 @@ class NovaCCUtilsTests(CharmTestCase):
pass
dummy_func()
self.assertFalse(self.service_running.called)
self.assertFalse(self.service_stop.called)
self.service_running.assert_not_called()
self.service_stop.assert_not_called()
self.assertTrue(_mc.called)
def test_service_guard_active_with_active_function_object(self):
@ -1403,7 +1403,7 @@ class NovaCCUtilsTests(CharmTestCase):
pass
dummy_func()
self.assertFalse(self.service_running.called)
self.service_running.assert_not_called()
self.assertFalse(_mc.called)
def test_assess_status(self):
@ -1859,8 +1859,8 @@ class NovaCCUtilsTests(CharmTestCase):
mock_is_db_initialised):
mock_is_db_initialised.return_value = False
utils.update_child_cell('cell2', 'mysql-cell2', 'amqp-cell2')
self.assertFalse(mock_check_output.called)
self.assertFalse(self.service_restart.called)
mock_check_output.assert_not_called()
self.service_restart.assert_not_called()
@patch.object(utils, 'get_cell_details')
@patch.object(utils, 'is_db_initialised')
@ -1873,8 +1873,8 @@ class NovaCCUtilsTests(CharmTestCase):
mock_get_cell_details.return_value = {}
utils.update_child_cell('cell2', 'mysql-cell2', 'amqp-cell2')
mock_get_cell_details.assert_called_once_with()
self.assertFalse(mock_check_output.called)
self.assertFalse(self.service_restart.called)
mock_check_output.assert_not_called()
self.service_restart.assert_not_called()
@patch.object(utils.subprocess, 'check_output')
@patch.object(utils, 'get_cell_details')
@ -1888,8 +1888,8 @@ class NovaCCUtilsTests(CharmTestCase):
mock_get_cell_details.return_value = {'cell1': 'uuid4cell1'}
mock_get_cell_db_context.return_value = {}
utils.update_child_cell('cell2', 'mysql-cell2', 'amqp-cell2')
self.assertFalse(mock_check_output.called)
self.assertFalse(self.service_restart.called)
mock_check_output.assert_not_called()
self.service_restart.assert_not_called()
@patch.object(utils, 'get_cell_amqp_context')
@patch.object(utils, 'get_sql_uri')
@ -1908,8 +1908,8 @@ class NovaCCUtilsTests(CharmTestCase):
mock_get_cell_db_context.return_value = {'ctxt': 'a full context'}
mock_get_cell_amqp_context.return_value = {}
utils.update_child_cell('cell2', 'mysql-cell2', 'amqp-cell2')
self.assertFalse(mock_check_output.called)
self.assertFalse(self.service_restart.called)
mock_check_output.assert_not_called()
self.service_restart.assert_not_called()
@patch('os.remove')
@patch('os.path.exists')
@ -1918,7 +1918,7 @@ class NovaCCUtilsTests(CharmTestCase):
self.os_release.return_value = 'stein'
exists.return_value = True
utils.disable_deprecated_nova_placement_apache_site()
self.assertTrue(remove.called)
remove.assert_called()
@patch.object(utils.ch_context, 'SharedDBContext')
@patch.object(utils, 'get_cell_details')