openstack/charm-cinder
Code Issues Proposed changes

Change assert(Not)Equals to assert(Not)Equal

Browse Source 
According to http://docs.python.org/2/library/unittest.html
assert(Not)Equals is a deprecated alias of assert(Not)Equal.

Change-Id: I242db7583487d735faba46ac76798cc06967adb6
Closes-Bug: #1329757
This commit is contained in:
melissaml 2017-09-13 16:24:18 +08:00
parent 0524e9e400
commit 44ea2653ae
3 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
unit_tests/test_cinder_contexts.py
View File

@ -50,30 +50,30 @@ class TestCinderContext(CharmTestCase):
def test_glance_not_related(self):
self.relation_ids.return_value = []
self.assertEquals(contexts.ImageServiceContext()(), {})
self.assertEqual(contexts.ImageServiceContext()(), {})
def test_glance_related(self):
self.relation_ids.return_value = ['image-service:0']
self.config.return_value = '1'
self.assertEquals(contexts.ImageServiceContext()(),
{'glance_api_version': '1'})
self.assertEqual(contexts.ImageServiceContext()(),
{'glance_api_version': '1'})
def test_glance_related_api_v2(self):
self.relation_ids.return_value = ['image-service:0']
self.config.return_value = '2'
self.assertEquals(contexts.ImageServiceContext()(),
{'glance_api_version': '2'})
self.assertEqual(contexts.ImageServiceContext()(),
{'glance_api_version': '2'})
def test_ceph_not_related(self):
self.relation_ids.return_value = []
self.assertEquals(contexts.CephContext()(), {})
self.assertEqual(contexts.CephContext()(), {})
def test_ceph_related(self):
self.relation_ids.return_value = ['ceph:0']
self.os_release.return_value = 'havana'
service = 'mycinder'
self.service_name.return_value = service
self.assertEquals(
self.assertEqual(
contexts.CephContext()(),
{'volume_driver': 'cinder.volume.driver.RBDDriver',
'rbd_pool': service,
@ -85,7 +85,7 @@ class TestCinderContext(CharmTestCase):
self.os_release.return_value = 'icehouse'
service = 'mycinder'
self.service_name.return_value = service
self.assertEquals(
self.assertEqual(
contexts.CephContext()(),
{'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver',
'rbd_pool': service,
@ -97,7 +97,7 @@ class TestCinderContext(CharmTestCase):
self.os_release.return_value = 'ocata'
service = 'mycinder'
self.service_name.return_value = service
self.assertEquals(
self.assertEqual(
contexts.CephContext()(),
{'ceph_volume_driver': 'cinder.volume.drivers.rbd.RBDDriver',
'rbd_pool': service,
@ -107,13 +107,13 @@ class TestCinderContext(CharmTestCase):
@patch.object(utils, 'service_enabled')
def test_apache_ssl_context_service_disabled(self, service_enabled):
service_enabled.return_value = False
self.assertEquals(contexts.ApacheSSLContext()(), {})
self.assertEqual(contexts.ApacheSSLContext()(), {})
def test_storage_backend_no_backends(self):
self.config.return_value = None
self.relation_ids.return_value = []
self.os_release.return_value = 'havana'
self.assertEquals(contexts.StorageBackendContext()(), {})
self.assertEqual(contexts.StorageBackendContext()(), {})
def test_storage_backend_single_backend(self):
rel_dict = {
@ -124,9 +124,9 @@ class TestCinderContext(CharmTestCase):
self.related_units.return_value = ['cinder-ceph/0']
self.relation_get.return_value = 'cinder-ceph'
self.os_release.return_value = 'havana'
self.assertEquals(contexts.StorageBackendContext()(),
{'backends': 'cinder-ceph',
'active_backends': ['cinder-ceph']})
self.assertEqual(contexts.StorageBackendContext()(),
{'backends': 'cinder-ceph',
'active_backends': ['cinder-ceph']})
def test_storage_backend_multi_backend(self):
self.config.return_value = None
@ -138,7 +138,7 @@ class TestCinderContext(CharmTestCase):
self.related_units.side_effect = [['cinder-ceph/0'],
['cinder-vmware/0']]
self.relation_get.side_effect = ['cinder-ceph', 'cinder-vmware']
self.assertEquals(
self.assertEqual(
contexts.StorageBackendContext()(),
{'backends': 'cinder-ceph,cinder-vmware',
'active_backends': ['cinder-ceph', 'cinder-vmware']})
@ -179,13 +179,13 @@ class TestCinderContext(CharmTestCase):
ctxt.configure_ca = MagicMock()
ctxt.canonical_names = MagicMock()
service_enabled.return_value = False
self.assertEquals(ctxt(), {})
self.assertEqual(ctxt(), {})
self.assertFalse(mock_https.called)
service_enabled.return_value = True
self.assertEquals(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4',
34, 12)],
'ext_ports': [34],
'namespace': 'cinder'})
self.assertEqual(ctxt(), {'endpoints': [('1.2.3.4', '1.2.3.4',
34, 12)],
'ext_ports': [34],
'namespace': 'cinder'})
self.assertTrue(mock_https.called)
mock_unit_get.assert_called_with('private-address')
@ -240,7 +240,7 @@ class TestCinderContext(CharmTestCase):
[u'rbd_pool', u'cinder-ceph'],
[u'rbd_user', u'cinder-ceph']]}}
self.assertEquals(ctxt, exp)
self.assertEqual(ctxt, exp)
@patch('%s.relation_get' % (mod_ch_context))
@patch('%s.related_units' % (mod_ch_context))
@ -294,7 +294,7 @@ class TestCinderContext(CharmTestCase):
[u'rbd_pool', u'cinder-ceph'],
[u'rbd_user', u'cinder-ceph']]}}
self.assertEquals(ctxt, exp)
self.assertEqual(ctxt, exp)
del settings['stateless']
@ -311,7 +311,7 @@ class TestCinderContext(CharmTestCase):
[u'rbd_pool', u'cinder-ceph'],
[u'rbd_user', u'cinder-ceph']]}}
self.assertEquals(ctxt, exp)
self.assertEqual(ctxt, exp)
@patch('%s.relation_get' % (mod_ch_context))
@patch('%s.related_units' % (mod_ch_context))
@ -393,7 +393,7 @@ class TestCinderContext(CharmTestCase):
[u'volume_driver',
u'cinder.volume.drivers.OtherDriver']]}}
self.assertEquals(ctxt, exp)
self.assertEqual(ctxt, exp)
def test_region_context(self):
self.config.return_value = 'two'

40
unit_tests/test_cinder_utils.py
View File

@ -127,7 +127,7 @@ class TestCinderUtils(CharmTestCase):
enabled = []
for s in ['volume', 'api', 'scheduler']:
enabled.append(cinder_utils.service_enabled(s))
self.assertEquals(enabled, [True, True, True])
self.assertEqual(enabled, [True, True, True])
def test_service_enabled(self):
'It determines services are enabled based on config'
@ -146,11 +146,11 @@ class TestCinderUtils(CharmTestCase):
git_requested.return_value = False
service_enabled.return_value = True
pkgs = cinder_utils.determine_packages()
self.assertEquals(sorted(pkgs),
sorted(cinder_utils.COMMON_PACKAGES +
cinder_utils.VOLUME_PACKAGES +
cinder_utils.API_PACKAGES +
cinder_utils.SCHEDULER_PACKAGES))
self.assertEqual(sorted(pkgs),
sorted(cinder_utils.COMMON_PACKAGES +
cinder_utils.VOLUME_PACKAGES +
cinder_utils.API_PACKAGES +
cinder_utils.SCHEDULER_PACKAGES))
@patch('cinder_utils.service_enabled')
@patch('cinder_utils.git_install_requested')
@ -164,19 +164,19 @@ class TestCinderUtils(CharmTestCase):
self.test_config.set('enabled-services', 'api')
pkgs = cinder_utils.determine_packages()
common = cinder_utils.COMMON_PACKAGES
self.assertEquals(
self.assertEqual(
sorted(pkgs),
sorted(common + cinder_utils.API_PACKAGES + ['memcached']))
self.test_config.set('enabled-services', 'volume')
pkgs = cinder_utils.determine_packages()
common = cinder_utils.COMMON_PACKAGES
self.assertEquals(
self.assertEqual(
sorted(pkgs),
sorted(common + cinder_utils.VOLUME_PACKAGES + ['memcached']))
self.test_config.set('enabled-services', 'api,scheduler')
pkgs = cinder_utils.determine_packages()
common = cinder_utils.COMMON_PACKAGES
self.assertEquals(
self.assertEqual(
sorted(pkgs),
sorted(common + cinder_utils.API_PACKAGES + ['memcached'] +
cinder_utils.SCHEDULER_PACKAGES))
@ -187,7 +187,7 @@ class TestCinderUtils(CharmTestCase):
('test_conf1', ['svc1']),
('test_conf2', ['svc2', 'svc3', 'svc1']),
])
self.assertEquals(cinder_utils.services(), ['svc2', 'svc3', 'svc1'])
self.assertEqual(cinder_utils.services(), ['svc2', 'svc3', 'svc1'])
@patch('cinder_utils.service_enabled')
@patch('os.path.exists')
@ -209,8 +209,8 @@ class TestCinderUtils(CharmTestCase):
['apache2']),
])
for cfg in ex_map.keys():
self.assertEquals(cinder_utils.resource_map()[cfg]['services'],
ex_map[cfg])
self.assertEqual(cinder_utils.resource_map()[cfg]['services'],
ex_map[cfg])
@patch('cinder_utils.service_enabled')
@patch('os.path.exists')
@ -231,8 +231,8 @@ class TestCinderUtils(CharmTestCase):
['apache2']),
])
for cfg in ex_map.keys():
self.assertEquals(cinder_utils.resource_map()[cfg]['services'],
ex_map[cfg])
self.assertEqual(cinder_utils.resource_map()[cfg]['services'],
ex_map[cfg])
@patch('cinder_utils.service_enabled')
@patch('os.path.exists')
@ -370,7 +370,7 @@ class TestCinderUtils(CharmTestCase):
ex_map = OrderedDict([
('/etc/testfile1.conf', ['svc1']),
])
self.assertEquals(cinder_utils.restart_map(), ex_map)
self.assertEqual(cinder_utils.restart_map(), ex_map)
def test_clean_storage_unmount(self):
'It unmounts block device when cleaning storage'
@ -810,7 +810,7 @@ class TestCinderUtils(CharmTestCase):
call('/var/log/cinder', owner='cinder', perms=488, force=False,
group='cinder'),
]
self.assertEquals(mkdir.call_args_list, expected)
self.assertEqual(mkdir.call_args_list, expected)
expected = [
call('/var/log/cinder/cinder-api.log', '', perms=0600,
owner='cinder', group='cinder'),
@ -821,7 +821,7 @@ class TestCinderUtils(CharmTestCase):
call('/var/log/cinder/cinder-volume.log', '', perms=0600,
owner='cinder', group='cinder'),
]
self.assertEquals(write_file.call_args_list, expected)
self.assertEqual(write_file.call_args_list, expected)
@patch.object(cinder_utils, 'services')
@patch('os.path.join')
@ -912,9 +912,9 @@ class TestCinderUtils(CharmTestCase):
cinder_volume_context, perms=0o644,
templates_dir='joined-string'),
]
self.assertEquals(self.render.call_args_list, expected)
self.assertEqual(self.render.call_args_list, expected)
expected = [call('tgtd'), call('svc1')]
self.assertEquals(self.service_restart.call_args_list, expected)
self.assertEqual(self.service_restart.call_args_list, expected)
@patch.object(cinder_utils, 'services')
@patch('os.path.join')
@ -948,7 +948,7 @@ class TestCinderUtils(CharmTestCase):
call('git/cinder-volume.init.in.template', 'joined-string',
{'daemon_path': 'joined-string'}, perms=420),
]
self.assertEquals(self.render.call_args_list, expected)
self.assertEqual(self.render.call_args_list, expected)
@patch.object(cinder_utils, 'local_unit', lambda *args: 'unit/0')
def test_check_local_db_actions_complete_by_self(self):

2
unit_tests/test_cluster_hooks.py
View File

@ -103,7 +103,7 @@ class TestClusterHooks(CharmTestCase):
call('stop', 'apache2'),
call('start', 'apache2'),
]
self.assertEquals(ex, service.call_args_list)
self.assertEqual(ex, service.call_args_list)
@patch.object(hooks, 'check_local_db_actions_complete',
lambda *args, **kwargs: None)