From c5072518ca69e772836105f7c677dd62ca8150e6 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sat, 16 Feb 2013 23:04:14 -0800 Subject: [PATCH] Remove deprecated assertEquals alias. We have code in the tree that uses both assertEquals and assertEqual. The former is deprecated: http://docs.python.org/2/library/unittest.html#deprecated-aliases As it's a REALLY simple thing to fix, I went ahead and made it all happy. Change-Id: Ibbd9461e2bda591693a6775b9ede1e87b8c008f2 --- .../tests/unit/bigswitch/test_router_db.py | 10 ++--- .../tests/unit/midonet/test_midonet_lib.py | 14 +++--- .../tests/unit/midonet/test_midonet_plugin.py | 4 +- quantum/tests/unit/nicira/test_networkgw.py | 20 ++++----- .../tests/unit/nicira/test_nicira_plugin.py | 38 ++++++++-------- quantum/tests/unit/test_agent_config.py | 6 +-- quantum/tests/unit/test_attributes.py | 24 +++++----- quantum/tests/unit/test_db.py | 2 +- quantum/tests/unit/test_db_plugin.py | 2 +- .../tests/unit/test_extension_extraroute.py | 16 +++---- .../tests/unit/test_extension_portsecurity.py | 36 +++++++-------- .../unit/test_extension_security_group.py | 10 ++--- .../tests/unit/test_security_groups_rpc.py | 44 +++++++++---------- quantum/tests/unit/test_servicetype.py | 12 ++--- 14 files changed, 119 insertions(+), 119 deletions(-) diff --git a/quantum/tests/unit/bigswitch/test_router_db.py b/quantum/tests/unit/bigswitch/test_router_db.py index c80653557..752bedc30 100644 --- a/quantum/tests/unit/bigswitch/test_router_db.py +++ b/quantum/tests/unit/bigswitch/test_router_db.py @@ -174,7 +174,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): body = self._show('routers', r['router']['id']) net_id = (body['router'] ['external_gateway_info']['network_id']) - self.assertEquals(net_id, s1['subnet']['network_id']) + self.assertEqual(net_id, s1['subnet']['network_id']) self._set_net_external(s2['subnet']['network_id']) self._add_external_gateway_to_router( r['router']['id'], @@ -182,7 +182,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): body = self._show('routers', r['router']['id']) net_id = (body['router'] ['external_gateway_info']['network_id']) - self.assertEquals(net_id, s2['subnet']['network_id']) + self.assertEqual(net_id, s2['subnet']['network_id']) self._remove_external_gateway_from_router( r['router']['id'], s2['subnet']['network_id']) @@ -265,7 +265,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): self.assertTrue('port_id' in body) r_port_id = body['port_id'] body = self._show('ports', r_port_id) - self.assertEquals(body['port']['device_id'], r_id) + self.assertEqual(body['port']['device_id'], r_id) with self.subnet(cidr='10.0.20.0/24') as s1: s1_id = s1['subnet']['id'] @@ -274,7 +274,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): self.assertTrue('port_id' in body) r1_port_id = body['port_id'] body = self._show('ports', r1_port_id) - self.assertEquals(body['port']['device_id'], r1_id) + self.assertEqual(body['port']['device_id'], r1_id) with self.subnet(cidr='11.0.0.0/24') as public_sub: public_net_id = public_sub['subnet']['network_id'] @@ -298,7 +298,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase): floatingip = self.deserialize(fmt, res) result = plugin_obj._send_all_data() - self.assertEquals(result[0], 200) + self.assertEqual(result[0], 200) self._delete('floatingips', floatingip['floatingip']['id']) diff --git a/quantum/tests/unit/midonet/test_midonet_lib.py b/quantum/tests/unit/midonet/test_midonet_lib.py index ead637e19..6774a1636 100644 --- a/quantum/tests/unit/midonet/test_midonet_lib.py +++ b/quantum/tests/unit/midonet/test_midonet_lib.py @@ -105,9 +105,9 @@ class MidonetChainManagerTestCase(MidonetLibTestCase): self.mock_api.assert_has_calls(mock.call.get_chains( {"tenant_id": tenant_id})) - self.assertEquals(len(chains), 2) - self.assertEquals(chains['in'], in_chain) - self.assertEquals(chains['out'], out_chain) + self.assertEqual(len(chains), 2) + self.assertEqual(chains['in'], in_chain) + self.assertEqual(chains['out'], out_chain) def test_create_router_chains(self): tenant_id = 'test_tenant' @@ -130,9 +130,9 @@ class MidonetChainManagerTestCase(MidonetLibTestCase): self.mock_api.assert_has_calls(mock.call.get_chains( {"tenant_id": tenant_id})) - self.assertEquals(len(chains), 2) - self.assertEquals(chains['in'], in_chain) - self.assertEquals(chains['out'], out_chain) + self.assertEqual(len(chains), 2) + self.assertEqual(chains['in'], in_chain) + self.assertEqual(chains['out'], out_chain) class MidonetPortGroupManagerTestCase(MidonetLibTestCase): @@ -176,7 +176,7 @@ class MidonetPortGroupManagerTestCase(MidonetLibTestCase): pg = self.mgr.get_for_sg(tenant_id, sg_id) - self.assertEquals(pg, pg_mock) + self.assertEqual(pg, pg_mock) class MidonetRuleManagerTestCase(MidonetLibTestCase): diff --git a/quantum/tests/unit/midonet/test_midonet_plugin.py b/quantum/tests/unit/midonet/test_midonet_plugin.py index 883cd3e95..3b26f2030 100644 --- a/quantum/tests/unit/midonet/test_midonet_plugin.py +++ b/quantum/tests/unit/midonet/test_midonet_plugin.py @@ -120,8 +120,8 @@ class TestMidonetNetworksV2(test_plugin.TestNetworksV2, with self.network(name='net1') as net1: req = self.new_list_request('networks') res = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(res['networks'][0]['name'], - net1['network']['name']) + self.assertEqual(res['networks'][0]['name'], + net1['network']['name']) def test_show_network(self): self._setup_bridge_mock() diff --git a/quantum/tests/unit/nicira/test_networkgw.py b/quantum/tests/unit/nicira/test_networkgw.py index ecc7c0eeb..6389d37fe 100644 --- a/quantum/tests/unit/nicira/test_networkgw.py +++ b/quantum/tests/unit/nicira/test_networkgw.py @@ -285,8 +285,8 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase): # fetch port and confirm device_id gw_port_id = connection_info['port_id'] port_body = self._show('ports', gw_port_id) - self.assertEquals(port_body['port']['device_id'], - gw[self.resource]['id']) + self.assertEqual(port_body['port']['device_id'], + gw[self.resource]['id']) # Clean up - otherwise delete will fail body = self._gateway_action('disconnect', gw[self.resource]['id'], @@ -304,7 +304,7 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase): keys = [('devices', devices), ('name', name)] with self._network_gateway(name=name, devices=devices) as gw: for k, v in keys: - self.assertEquals(gw[self.resource][k], v) + self.assertEqual(gw[self.resource][k], v) def _test_delete_network_gateway(self, exp_gw_count=0): name = 'test-gw' @@ -338,8 +338,8 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase): req = self.new_show_request(networkgw.COLLECTION_NAME, gw[self.resource]['id']) res = self.deserialize('json', req.get_response(self.ext_api)) - self.assertEquals(res[self.resource]['name'], - gw[self.resource]['name']) + self.assertEqual(res[self.resource]['name'], + gw[self.resource]['name']) def test_list_network_gateways(self): with self._network_gateway(name='test-gw-1') as gw1: @@ -347,11 +347,11 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase): req = self.new_list_request(networkgw.COLLECTION_NAME) res = self.deserialize('json', req.get_response(self.ext_api)) key = self.resource + 's' - self.assertEquals(len(res[key]), 2) - self.assertEquals(res[key][0]['name'], - gw1[self.resource]['name']) - self.assertEquals(res[key][1]['name'], - gw2[self.resource]['name']) + self.assertEqual(len(res[key]), 2) + self.assertEqual(res[key][0]['name'], + gw1[self.resource]['name']) + self.assertEqual(res[key][1]['name'], + gw2[self.resource]['name']) def test_connect_and_disconnect_network(self): self._test_connect_and_disconnect_network('flat') diff --git a/quantum/tests/unit/nicira/test_nicira_plugin.py b/quantum/tests/unit/nicira/test_nicira_plugin.py index d86e6084a..a5791a39f 100644 --- a/quantum/tests/unit/nicira/test_nicira_plugin.py +++ b/quantum/tests/unit/nicira/test_nicira_plugin.py @@ -748,8 +748,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lswitch_dict.clear() req = self.new_list_request('networks') nets = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(nets['networks'][0]['status'], - constants.NET_STATUS_ERROR) + self.assertEqual(nets['networks'][0]['status'], + constants.NET_STATUS_ERROR) def test_show_network_not_in_nvp(self): res = self._create_network('json', 'net1', True) @@ -757,8 +757,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lswitch_dict.clear() req = self.new_show_request('networks', net['network']['id']) net = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(net['network']['status'], - constants.NET_STATUS_ERROR) + self.assertEqual(net['network']['status'], + constants.NET_STATUS_ERROR) def test_delete_port_not_in_nvp(self): res = self._create_network('json', 'net1', True) @@ -778,8 +778,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lswitch_lport_dict.clear() req = self.new_list_request('ports') nets = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(nets['ports'][0]['status'], - constants.PORT_STATUS_ERROR) + self.assertEqual(nets['ports'][0]['status'], + constants.PORT_STATUS_ERROR) def test_show_port_not_in_nvp(self): res = self._create_network('json', 'net1', True) @@ -789,8 +789,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lswitch_lport_dict.clear() req = self.new_show_request('ports', port['port']['id']) net = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(net['port']['status'], - constants.PORT_STATUS_ERROR) + self.assertEqual(net['port']['status'], + constants.PORT_STATUS_ERROR) def test_delete_port_and_network_not_in_nvp(self): res = self._create_network('json', 'net1', True) @@ -820,8 +820,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lrouter_dict.clear() req = self.new_list_request('routers') routers = self.deserialize('json', req.get_response(self.ext_api)) - self.assertEquals(routers['routers'][0]['status'], - constants.NET_STATUS_ERROR) + self.assertEqual(routers['routers'][0]['status'], + constants.NET_STATUS_ERROR) def test_show_router_not_in_nvp(self): res = self._create_router('json', 'tenant') @@ -829,8 +829,8 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase, self.fc._fake_lrouter_dict.clear() req = self.new_show_request('routers', router['router']['id']) router = self.deserialize('json', req.get_response(self.ext_api)) - self.assertEquals(router['router']['status'], - constants.NET_STATUS_ERROR) + self.assertEqual(router['router']['status'], + constants.NET_STATUS_ERROR) class TestNiciraNetworkGateway(test_l2_gw.NetworkGatewayDbTestCase, @@ -849,13 +849,13 @@ class TestNiciraNetworkGateway(test_l2_gw.NetworkGatewayDbTestCase, res = self.deserialize('json', req.get_response(self.ext_api)) # We expect the default gateway too key = self.resource + 's' - self.assertEquals(len(res[key]), 3) - self.assertEquals(res[key][0]['default'], - True) - self.assertEquals(res[key][1]['name'], - gw1[self.resource]['name']) - self.assertEquals(res[key][2]['name'], - gw2[self.resource]['name']) + self.assertEqual(len(res[key]), 3) + self.assertEqual(res[key][0]['default'], + True) + self.assertEqual(res[key][1]['name'], + gw1[self.resource]['name']) + self.assertEqual(res[key][2]['name'], + gw2[self.resource]['name']) def test_delete_network_gateway(self): # The default gateway must still be there diff --git a/quantum/tests/unit/test_agent_config.py b/quantum/tests/unit/test_agent_config.py index f1a800734..5a01c43e1 100644 --- a/quantum/tests/unit/test_agent_config.py +++ b/quantum/tests/unit/test_agent_config.py @@ -31,15 +31,15 @@ class TestRootHelper(testtools.TestCase): conf = config.setup_conf() config.register_root_helper(conf) conf.set_override('root_helper', 'my_root_helper', 'AGENT') - self.assertEquals(config.get_root_helper(conf), 'my_root_helper') + self.assertEqual(config.get_root_helper(conf), 'my_root_helper') def test_root_helper(self): conf = config.setup_conf() config.register_root_helper(conf) conf.set_override('root_helper', 'my_root_helper') - self.assertEquals(config.get_root_helper(conf), 'my_root_helper') + self.assertEqual(config.get_root_helper(conf), 'my_root_helper') def test_root_default(self): conf = config.setup_conf() config.register_root_helper(conf) - self.assertEquals(config.get_root_helper(conf), 'sudo') + self.assertEqual(config.get_root_helper(conf), 'sudo') diff --git a/quantum/tests/unit/test_attributes.py b/quantum/tests/unit/test_attributes.py index dc7e61015..9863cbbe5 100644 --- a/quantum/tests/unit/test_attributes.py +++ b/quantum/tests/unit/test_attributes.py @@ -414,7 +414,7 @@ class TestAttributes(testtools.TestCase): for uuid in uuids: msg = attributes._validate_uuid_list(uuid) error = "'%s' is not a list" % uuid - self.assertEquals(msg, error) + self.assertEqual(msg, error) # check invalid uuid in a list invalid_uuid_lists = [[None], @@ -428,7 +428,7 @@ class TestAttributes(testtools.TestCase): for uuid_list in invalid_uuid_lists: msg = attributes._validate_uuid_list(uuid_list) error = "'%s' is not a valid UUID" % uuid_list[0] - self.assertEquals(msg, error) + self.assertEqual(msg, error) # check duplicate items in a list duplicate_uuids = ['e5069610-744b-42a7-8bd8-ceac1a229cd4', @@ -437,7 +437,7 @@ class TestAttributes(testtools.TestCase): msg = attributes._validate_uuid_list(duplicate_uuids) error = ("Duplicate items in the list: " "'%s'" % ', '.join(duplicate_uuids)) - self.assertEquals(msg, error) + self.assertEqual(msg, error) # check valid uuid lists valid_uuid_lists = [['e5069610-744b-42a7-8bd8-ceac1a229cd4'], @@ -446,12 +446,12 @@ class TestAttributes(testtools.TestCase): 'f3eeab00-8367-4524-b662-55e64d4cacb5']] for uuid_list in valid_uuid_lists: msg = attributes._validate_uuid_list(uuid_list) - self.assertEquals(msg, None) + self.assertEqual(msg, None) def test_validate_dict_type(self): for value in (None, True, '1', []): - self.assertEquals(attributes._validate_dict(value), - "'%s' is not a dictionary" % value) + self.assertEqual(attributes._validate_dict(value), + "'%s' is not a dictionary" % value) def test_validate_dict_without_constraints(self): msg = attributes._validate_dict({}) @@ -529,8 +529,8 @@ class TestAttributes(testtools.TestCase): def test_validate_non_negative(self): for value in (-1, '-2'): - self.assertEquals(attributes._validate_non_negative(value), - "'%s' should be non-negative" % value) + self.assertEqual(attributes._validate_non_negative(value), + "'%s' should be non-negative" % value) for value in (0, 1, '2', True, False): msg = attributes._validate_non_negative(value) @@ -632,16 +632,16 @@ class TestConvertToList(testtools.TestCase): def test_convert_to_empty_list(self): for item in (None, [], (), {}): - self.assertEquals(attributes.convert_to_list(item), []) + self.assertEqual(attributes.convert_to_list(item), []) def test_convert_to_list_string(self): for item in ('', 'foo'): - self.assertEquals(attributes.convert_to_list(item), [item]) + self.assertEqual(attributes.convert_to_list(item), [item]) def test_convert_to_list_iterable(self): for item in ([None], [1, 2, 3], (1, 2, 3), set([1, 2, 3]), ['foo']): - self.assertEquals(attributes.convert_to_list(item), list(item)) + self.assertEqual(attributes.convert_to_list(item), list(item)) def test_convert_to_list_non_iterable(self): for item in (True, False, 1, 1.2, object()): - self.assertEquals(attributes.convert_to_list(item), [item]) + self.assertEqual(attributes.convert_to_list(item), [item]) diff --git a/quantum/tests/unit/test_db.py b/quantum/tests/unit/test_db.py index dcdf376ed..0f7d9b269 100644 --- a/quantum/tests/unit/test_db.py +++ b/quantum/tests/unit/test_db.py @@ -42,6 +42,6 @@ class DBTestCase(testtools.TestCase): with mock.patch.object(db.LOG, 'warn') as mock_log: mock_log.return_value = False db.configure_db() - self.assertEquals(mock_log.call_count, 1) + self.assertEqual(mock_log.call_count, 1) args = mock_log.call_args self.assertNotEqual(args.find('sql_connection'), -1) diff --git a/quantum/tests/unit/test_db_plugin.py b/quantum/tests/unit/test_db_plugin.py index a6559220e..3707d5077 100644 --- a/quantum/tests/unit/test_db_plugin.py +++ b/quantum/tests/unit/test_db_plugin.py @@ -3026,7 +3026,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase): req = self.new_update_request('subnets', data, subnet['subnet']['id']) res = req.get_response(self.api) - self.assertEquals(res.status_int, 409) + self.assertEqual(res.status_int, 409) def test_show_subnet(self): with self.network() as network: diff --git a/quantum/tests/unit/test_extension_extraroute.py b/quantum/tests/unit/test_extension_extraroute.py index d83e1e2fd..54d247e50 100644 --- a/quantum/tests/unit/test_extension_extraroute.py +++ b/quantum/tests/unit/test_extension_extraroute.py @@ -93,8 +93,8 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase): {'router': {'routes': routes}}) body = self._show('routers', r['router']['id']) - self.assertEquals(body['router']['routes'], - routes) + self.assertEqual(body['router']['routes'], + routes) self._update('routers', r['router']['id'], {'router': {'routes': []}}) # clean-up @@ -119,8 +119,8 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase): {'router': {'routes': routes}}) body = self._show('routers', r['router']['id']) - self.assertEquals(body['router']['routes'], - routes) + self.assertEqual(body['router']['routes'], + routes) self._router_interface_action( 'remove', @@ -422,7 +422,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase): s['subnet']['network_id']) body = self._show('routers', r['router']['id']) net_id = body['router']['external_gateway_info']['network_id'] - self.assertEquals(net_id, s['subnet']['network_id']) + self.assertEqual(net_id, s['subnet']['network_id']) port_res = self._list_ports('json', 200, s['subnet']['network_id'], @@ -439,15 +439,15 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase): routes}}) body = self._show('routers', r['router']['id']) - self.assertEquals(body['router']['routes'], - routes) + self.assertEqual(body['router']['routes'], + routes) self._remove_external_gateway_from_router( r['router']['id'], s['subnet']['network_id']) body = self._show('routers', r['router']['id']) gw_info = body['router']['external_gateway_info'] - self.assertEquals(gw_info, None) + self.assertEqual(gw_info, None) def test_router_list_with_sort(self): with contextlib.nested(self.router(name='router1'), diff --git a/quantum/tests/unit/test_extension_portsecurity.py b/quantum/tests/unit/test_extension_portsecurity.py index 59907327d..a68948adb 100644 --- a/quantum/tests/unit/test_extension_portsecurity.py +++ b/quantum/tests/unit/test_extension_portsecurity.py @@ -190,34 +190,34 @@ class TestPortSecurity(PortSecurityDBTestCase): def test_create_network_with_portsecurity_mac(self): res = self._create_network('json', 'net1', True) net = self.deserialize('json', res) - self.assertEquals(net['network'][psec.PORTSECURITY], True) + self.assertEqual(net['network'][psec.PORTSECURITY], True) def test_create_network_with_portsecurity_false(self): res = self._create_network('json', 'net1', True, arg_list=('port_security_enabled',), port_security_enabled=False) net = self.deserialize('json', res) - self.assertEquals(net['network'][psec.PORTSECURITY], False) + self.assertEqual(net['network'][psec.PORTSECURITY], False) def test_updating_network_port_security(self): res = self._create_network('json', 'net1', True, port_security_enabled='True') net = self.deserialize('json', res) - self.assertEquals(net['network'][psec.PORTSECURITY], True) + self.assertEqual(net['network'][psec.PORTSECURITY], True) update_net = {'network': {psec.PORTSECURITY: False}} req = self.new_update_request('networks', update_net, net['network']['id']) net = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(net['network'][psec.PORTSECURITY], False) + self.assertEqual(net['network'][psec.PORTSECURITY], False) req = self.new_show_request('networks', net['network']['id']) net = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(net['network'][psec.PORTSECURITY], False) + self.assertEqual(net['network'][psec.PORTSECURITY], False) def test_create_port_default_true(self): with self.network() as net: res = self._create_port('json', net['network']['id']) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) self._delete('ports', port['port']['id']) def test_create_port_passing_true(self): @@ -227,7 +227,7 @@ class TestPortSecurity(PortSecurityDBTestCase): net = self.deserialize('json', res) res = self._create_port('json', net['network']['id']) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) self._delete('ports', port['port']['id']) def test_create_port_on_port_security_false_network(self): @@ -237,7 +237,7 @@ class TestPortSecurity(PortSecurityDBTestCase): net = self.deserialize('json', res) res = self._create_port('json', net['network']['id']) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], False) + self.assertEqual(port['port'][psec.PORTSECURITY], False) self._delete('ports', port['port']['id']) def test_create_port_security_overrides_network_value(self): @@ -249,7 +249,7 @@ class TestPortSecurity(PortSecurityDBTestCase): arg_list=('port_security_enabled',), port_security_enabled=True) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) self._delete('ports', port['port']['id']) def test_create_port_with_default_security_group(self): @@ -259,8 +259,8 @@ class TestPortSecurity(PortSecurityDBTestCase): with self.subnet(network=net): res = self._create_port('json', net['network']['id']) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) - self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 1) + self.assertEqual(port['port'][psec.PORTSECURITY], True) + self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 1) self._delete('ports', port['port']['id']) def test_update_port_security_off_with_security_group(self): @@ -270,7 +270,7 @@ class TestPortSecurity(PortSecurityDBTestCase): with self.subnet(network=net): res = self._create_port('json', net['network']['id']) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) update_port = {'port': {psec.PORTSECURITY: False}} req = self.new_update_request('ports', update_port, @@ -294,7 +294,7 @@ class TestPortSecurity(PortSecurityDBTestCase): arg_list=('port_security_enabled',), port_security_enabled=True) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) # remove security group on port update_port = {'port': {ext_sg.SECURITYGROUPS: None, @@ -303,8 +303,8 @@ class TestPortSecurity(PortSecurityDBTestCase): port['port']['id']) port = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(port['port'][psec.PORTSECURITY], False) - self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 0) + self.assertEqual(port['port'][psec.PORTSECURITY], False) + self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 0) self._delete('ports', port['port']['id']) def test_update_port_remove_port_security_security_group_readd(self): @@ -316,7 +316,7 @@ class TestPortSecurity(PortSecurityDBTestCase): arg_list=('port_security_enabled',), port_security_enabled=True) port = self.deserialize('json', res) - self.assertEquals(port['port'][psec.PORTSECURITY], True) + self.assertEqual(port['port'][psec.PORTSECURITY], True) # remove security group on port update_port = {'port': {ext_sg.SECURITYGROUPS: None, @@ -333,8 +333,8 @@ class TestPortSecurity(PortSecurityDBTestCase): port['port']['id']) port = self.deserialize('json', req.get_response(self.api)) - self.assertEquals(port['port'][psec.PORTSECURITY], True) - self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 1) + self.assertEqual(port['port'][psec.PORTSECURITY], True) + self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 1) self._delete('ports', port['port']['id']) def test_create_port_security_off_shared_network(self): diff --git a/quantum/tests/unit/test_extension_security_group.py b/quantum/tests/unit/test_extension_security_group.py index a7bc838b3..fa126439c 100644 --- a/quantum/tests/unit/test_extension_security_group.py +++ b/quantum/tests/unit/test_extension_security_group.py @@ -339,10 +339,10 @@ class TestSecurityGroups(SecurityGroupDBTestCase): ethertype=ethertype) as rule: # the lower case value will be return - self.assertEquals(rule['security_group_rule']['protocol'], - protocol.lower()) - self.assertEquals(rule['security_group_rule']['ethertype'], - 'IPv4') + self.assertEqual(rule['security_group_rule']['protocol'], + protocol.lower()) + self.assertEqual(rule['security_group_rule']['ethertype'], + 'IPv4') def test_get_security_group(self): name = 'webservers' @@ -606,7 +606,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase): ports = self.deserialize(self.fmt, res.get_response(self.api)) port = ports['ports'][0] - self.assertEquals(len(port[ext_sg.SECURITYGROUPS]), 1) + self.assertEqual(len(port[ext_sg.SECURITYGROUPS]), 1) self._delete('ports', port['id']) def test_list_security_group_rules(self): diff --git a/quantum/tests/unit/test_security_groups_rpc.py b/quantum/tests/unit/test_security_groups_rpc.py index b11876485..1cb0b22ab 100644 --- a/quantum/tests/unit/test_security_groups_rpc.py +++ b/quantum/tests/unit/test_security_groups_rpc.py @@ -71,7 +71,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rule2['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -96,8 +96,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'source_ip_prefix': fake_prefix}, {'ethertype': 'IPv4', 'direction': 'egress'}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) def test_security_group_rules_for_devices_ipv4_egress(self): @@ -120,7 +120,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rule2['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -144,8 +144,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'port_range_min': 23, 'dest_ip_prefix': fake_prefix}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) def test_security_group_rules_for_devices_ipv4_source_group(self): @@ -166,7 +166,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'security_group_rules': [rule1['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -194,8 +194,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'security_group_id': sg1_id}, {'ethertype': 'IPv4', 'direction': 'egress'}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) self._delete('ports', port_id2) @@ -223,7 +223,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rule2['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -249,8 +249,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'source_ip_prefix': fake_prefix}, {'ethertype': 'IPv6', 'direction': 'egress'}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) def test_security_group_rules_for_devices_ipv6_egress(self): @@ -277,7 +277,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): rule2['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -303,8 +303,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'port_range_min': 23, 'dest_ip_prefix': fake_prefix}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) def test_security_group_rules_for_devices_ipv6_source_group(self): @@ -329,7 +329,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'security_group_rules': [rule1['security_group_rule']]} res = self._create_security_group_rule(self.fmt, rules) self.deserialize(self.fmt, res) - self.assertEquals(res.status_int, 201) + self.assertEqual(res.status_int, 201) res1 = self._create_port( self.fmt, n['network']['id'], @@ -360,8 +360,8 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase): 'security_group_id': sg1_id}, {'ethertype': 'IPv6', 'direction': 'egress'}, ] - self.assertEquals(port_rpc['security_group_rules'], - expected) + self.assertEqual(port_rpc['security_group_rules'], + expected) self._delete('ports', port_id1) self._delete('ports', port_id2) @@ -534,12 +534,12 @@ class SecurityGroupAgentRpcApiTestCase(testtools.TestCase): def test_security_groups_rule_not_updated(self): self.notifier.security_groups_rule_updated( None, security_groups=[]) - self.assertEquals(False, self.notifier.fanout_cast.called) + self.assertEqual(False, self.notifier.fanout_cast.called) def test_security_groups_member_not_updated(self): self.notifier.security_groups_member_updated( None, security_groups=[]) - self.assertEquals(False, self.notifier.fanout_cast.called) + self.assertEqual(False, self.notifier.fanout_cast.called) #Note(nati) bn -> binary_name # id -> device_id @@ -1159,8 +1159,8 @@ class SGNotificationTestMixin(): port['port']['id']) res = self.deserialize(self.fmt, req.get_response(self.api)) - self.assertEquals(res['port'][ext_sg.SECURITYGROUPS][0], - security_group_id) + self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0], + security_group_id) self._delete('ports', port['port']['id']) self.notifier.assert_has_calls( [call.security_groups_member_updated( diff --git a/quantum/tests/unit/test_servicetype.py b/quantum/tests/unit/test_servicetype.py index 127feca36..bded46295 100644 --- a/quantum/tests/unit/test_servicetype.py +++ b/quantum/tests/unit/test_servicetype.py @@ -411,14 +411,14 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): data = self.deserialize(res) self.assertTrue('service_types' in data) # it must be 3 because we have the default service type too! - self.assertEquals(len(data['service_types']), 3) + self.assertEqual(len(data['service_types']), 3) def test_get_default_service_type(self): res = self._list_service_types() self.assertEqual(res.status_int, webexc.HTTPOk.code) data = self.deserialize(res) self.assertTrue('service_types' in data) - self.assertEquals(len(data['service_types']), 1) + self.assertEqual(len(data['service_types']), 1) def_svc_type = data['service_types'][0] self.assertEqual(def_svc_type['default'], True) @@ -438,7 +438,7 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): ctx = context.Context('', '', is_admin=True) mgr.increase_service_type_refcount(ctx, svc_type_data['id']) res = self._delete_service_type(svc_type_data['id'], True) - self.assertEquals(res.status_int, webexc.HTTPConflict.code) + self.assertEqual(res.status_int, webexc.HTTPConflict.code) mgr.decrease_service_type_refcount(ctx, svc_type_data['id']) def test_create_dummy_increases_service_type_refcount(self): @@ -446,20 +446,20 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase): svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self.deserialize(svc_type_res) svc_type = svc_type_res[self.resource_name] - self.assertEquals(svc_type['num_instances'], 1) + self.assertEqual(svc_type['num_instances'], 1) def test_delete_dummy_decreases_service_type_refcount(self): dummy = self._create_dummy() svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self.deserialize(svc_type_res) svc_type = svc_type_res[self.resource_name] - self.assertEquals(svc_type['num_instances'], 1) + self.assertEqual(svc_type['num_instances'], 1) self.api.delete(_get_path('dummys/%s' % str(dummy['id']), fmt=self.fmt)) svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self.deserialize(svc_type_res) svc_type = svc_type_res[self.resource_name] - self.assertEquals(svc_type['num_instances'], 0) + self.assertEqual(svc_type['num_instances'], 0) class ServiceTypeManagerTestCaseXML(ServiceTypeManagerTestCase): -- 2.45.2