Replace assertEquals with assertEqual.
DeprecationWarning: Please use assertEqual instead.
This commit is contained in:
@@ -42,8 +42,8 @@ class TestBaseCharmTest(ut_utils.BaseTestCase):
|
||||
return self.get_my_tests_options('aKey', 'aDefault')
|
||||
|
||||
f = FakeTest()
|
||||
self.assertEquals(f.method({}), 'aDefault')
|
||||
self.assertEquals(f.method({
|
||||
self.assertEqual(f.method({}), 'aDefault')
|
||||
self.assertEqual(f.method({
|
||||
'tests_options': {
|
||||
'unit_tests.charm_tests.test_utils.'
|
||||
'FakeTest.method.aKey': 'aValue',
|
||||
|
||||
@@ -127,7 +127,7 @@ class TestCephUtils(ut_utils.BaseTestCase):
|
||||
'{"op": "create-pool", "name": "cinder-ceph", '
|
||||
'"compression-mode": "aggressive"}]}'),
|
||||
}
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
ceph_utils.get_pools_from_broker_req(
|
||||
'anApplication', 'aModelName'),
|
||||
['cinder-ceph'])
|
||||
|
||||
@@ -1322,7 +1322,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
self.patch_object(openstack_utils.juju_utils,
|
||||
'get_machine_uuids_for_application')
|
||||
self.get_machine_uuids_for_application.return_value = 'ret'
|
||||
self.assertEquals(openstack_utils.get_gateway_uuids(), 'ret')
|
||||
self.assertEqual(openstack_utils.get_gateway_uuids(), 'ret')
|
||||
self.get_machine_uuids_for_application.assert_called_once_with(
|
||||
'neutron-gateway')
|
||||
|
||||
@@ -1330,7 +1330,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
self.patch_object(openstack_utils.juju_utils,
|
||||
'get_machine_uuids_for_application')
|
||||
self.get_machine_uuids_for_application.return_value = 'ret'
|
||||
self.assertEquals(openstack_utils.get_ovs_uuids(), 'ret')
|
||||
self.assertEqual(openstack_utils.get_ovs_uuids(), 'ret')
|
||||
self.get_machine_uuids_for_application.assert_called_once_with(
|
||||
'neutron-openvswitch')
|
||||
|
||||
@@ -1338,8 +1338,8 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
self.patch_object(openstack_utils.juju_utils,
|
||||
'get_machine_uuids_for_application')
|
||||
self.get_machine_uuids_for_application.return_value = ['ret']
|
||||
self.assertEquals(list(openstack_utils.get_ovn_uuids()),
|
||||
['ret', 'ret'])
|
||||
self.assertEqual(list(openstack_utils.get_ovn_uuids()),
|
||||
['ret', 'ret'])
|
||||
self.get_machine_uuids_for_application.assert_has_calls([
|
||||
mock.call('ovn-chassis'),
|
||||
mock.call('ovn-dedicated-chassis'),
|
||||
@@ -1387,7 +1387,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
with self.assertRaises(RuntimeError):
|
||||
openstack_utils.get_charm_networking_data()
|
||||
self.ngw_present.return_value = True
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
openstack_utils.get_charm_networking_data(),
|
||||
openstack_utils.CharmedOpenStackNetworkingData(
|
||||
openstack_utils.OpenStackNetworkingTopology.ML2_OVS,
|
||||
@@ -1396,7 +1396,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
'data-port',
|
||||
{}))
|
||||
self.dvr_enabled.return_value = True
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
openstack_utils.get_charm_networking_data(),
|
||||
openstack_utils.CharmedOpenStackNetworkingData(
|
||||
openstack_utils.OpenStackNetworkingTopology.ML2_OVS_DVR,
|
||||
@@ -1405,7 +1405,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
'data-port',
|
||||
{}))
|
||||
self.ngw_present.return_value = False
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
openstack_utils.get_charm_networking_data(),
|
||||
openstack_utils.CharmedOpenStackNetworkingData(
|
||||
openstack_utils.OpenStackNetworkingTopology.ML2_OVS_DVR_SNAT,
|
||||
@@ -1415,7 +1415,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
{}))
|
||||
self.dvr_enabled.return_value = False
|
||||
self.ovn_present.return_value = True
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
openstack_utils.get_charm_networking_data(),
|
||||
openstack_utils.CharmedOpenStackNetworkingData(
|
||||
openstack_utils.OpenStackNetworkingTopology.ML2_OVN,
|
||||
@@ -1424,7 +1424,7 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
|
||||
'bridge-interface-mappings',
|
||||
{'ovn-bridge-mappings': 'physnet1:br-ex'}))
|
||||
self.get_application.side_effect = None
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
openstack_utils.get_charm_networking_data(),
|
||||
openstack_utils.CharmedOpenStackNetworkingData(
|
||||
openstack_utils.OpenStackNetworkingTopology.ML2_OVN,
|
||||
|
||||
@@ -147,7 +147,7 @@ class CephFSTests(unittest.TestCase):
|
||||
"""
|
||||
model.set_application_config('ceph-fs', mds_config)
|
||||
results = _get_conf()
|
||||
self.assertEquals(
|
||||
self.assertEqual(
|
||||
results['mds_cache_memory_limit'],
|
||||
mds_config['mds-cache-memory-limit'])
|
||||
self.assertAlmostEqual(
|
||||
|
||||
@@ -1323,12 +1323,12 @@ class BlueStoreCompressionCharmOperation(test_utils.BaseCharmTest):
|
||||
if pd['pool_name'] == pool:
|
||||
if 'options' in expected_properties:
|
||||
for k, v in expected_properties['options'].items():
|
||||
self.assertEquals(pd['options'][k], v)
|
||||
self.assertEqual(pd['options'][k], v)
|
||||
log_func("['options']['{}'] == {}".format(k, v))
|
||||
for k, v in expected_properties.items():
|
||||
if k == 'options':
|
||||
continue
|
||||
self.assertEquals(pd[k], v)
|
||||
self.assertEqual(pd[k], v)
|
||||
log_func("{} == {}".format(k, v))
|
||||
|
||||
def test_configure_compression(self):
|
||||
|
||||
Reference in New Issue
Block a user