From 3cabda68d9a2a0e3bb96166b05d5852da326a427 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Tue, 3 Sep 2013 10:16:42 +0800 Subject: [PATCH] Use assertEqual instead of assertEquals For unittest, assertEquals is deprecated in py3, use assertEqual instead. Closes-Bug: #1218190 Change-Id: I51d68578e4a2bf10230bc95fc5fa62762ae0acea --- neutronclient/tests/unit/test_auth.py | 4 ++-- neutronclient/tests/unit/test_cli20_network.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/neutronclient/tests/unit/test_auth.py b/neutronclient/tests/unit/test_auth.py index e88803c13..9fa9e56b6 100644 --- a/neutronclient/tests/unit/test_auth.py +++ b/neutronclient/tests/unit/test_auth.py @@ -156,7 +156,7 @@ class CLITestAuthKeystone(testtools.TestCase): username=USERNAME, tenant_name=TENANT_NAME, password=PASSWORD, auth_url=AUTH_URL, region_name=REGION, endpoint_url=ENDPOINT_OVERRIDE) - self.assertEquals(self.client.endpoint_url, ENDPOINT_OVERRIDE) + self.assertEqual(self.client.endpoint_url, ENDPOINT_OVERRIDE) self.mox.StubOutWithMock(self.client, "request") @@ -171,7 +171,7 @@ class CLITestAuthKeystone(testtools.TestCase): ).AndReturn((res200, '')) self.mox.ReplayAll() self.client.do_request('/resource', 'GET') - self.assertEquals(self.client.endpoint_url, ENDPOINT_OVERRIDE) + self.assertEqual(self.client.endpoint_url, ENDPOINT_OVERRIDE) def test_get_endpoint_url_other(self): self.client = client.HTTPClient( diff --git a/neutronclient/tests/unit/test_cli20_network.py b/neutronclient/tests/unit/test_cli20_network.py index 46f125dff..cb1fefba4 100644 --- a/neutronclient/tests/unit/test_cli20_network.py +++ b/neutronclient/tests/unit/test_cli20_network.py @@ -131,7 +131,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): self.mox.VerifyAll() self.mox.UnsetStubs() _str = self.fake_stdout.make_string() - self.assertEquals('\n', _str) + self.assertEqual('\n', _str) def _test_list_networks(self, cmd, detail=False, tags=[], fields_1=[], fields_2=[], page_size=None, @@ -279,10 +279,10 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): args=['-f', 'json', '-c', 'id']) _str = self.fake_stdout.make_string() returned_networks = utils.loads(_str) - self.assertEquals(1, len(returned_networks)) + self.assertEqual(1, len(returned_networks)) net = returned_networks[0] - self.assertEquals(1, len(net)) - self.assertEquals("id", net.keys()[0]) + self.assertEqual(1, len(net)) + self.assertEqual("id", net.keys()[0]) def test_list_nets_with_default_column(self): cmd = network.ListNetwork(test_cli20.MyApp(sys.stdout), None) @@ -293,10 +293,10 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): self._test_list_nets_columns(cmd, returned_body) _str = self.fake_stdout.make_string() returned_networks = utils.loads(_str) - self.assertEquals(1, len(returned_networks)) + self.assertEqual(1, len(returned_networks)) net = returned_networks[0] - self.assertEquals(3, len(net)) - self.assertEquals(0, len(set(net) ^ set(cmd.list_columns))) + self.assertEqual(3, len(net)) + self.assertEqual(0, len(set(net) ^ set(cmd.list_columns))) def test_list_external_nets_empty_with_column(self): resources = "networks" @@ -325,7 +325,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base): self.mox.VerifyAll() self.mox.UnsetStubs() _str = self.fake_stdout.make_string() - self.assertEquals('\n', _str) + self.assertEqual('\n', _str) def _test_list_external_nets(self, resources, cmd, detail=False, tags=[],