From 2fbb1908288294cc621bfe805e7d57d002aee6d3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 17 Sep 2013 18:47:44 +0200 Subject: [PATCH] assertEquals is deprecated, use assertEqual (H602) Change-Id: Iefd087320659909b89864018ccb4ccf50a75aff6 --- .../tests/test_auth_token_middleware.py | 4 +- keystoneclient/tests/v2_0/test_access.py | 70 +++++++------- keystoneclient/tests/v2_0/test_client.py | 6 +- keystoneclient/tests/v2_0/test_discovery.py | 4 +- .../tests/v2_0/test_service_catalog.py | 24 ++--- keystoneclient/tests/v3/test_access.py | 92 +++++++++---------- keystoneclient/tests/v3/test_client.py | 28 +++--- keystoneclient/tests/v3/test_discover.py | 4 +- .../tests/v3/test_service_catalog.py | 20 ++-- 9 files changed, 125 insertions(+), 127 deletions(-) diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py index 25ff51451..d6c22d0dd 100644 --- a/keystoneclient/tests/test_auth_token_middleware.py +++ b/keystoneclient/tests/test_auth_token_middleware.py @@ -803,8 +803,8 @@ class CommonAuthTokenMiddlewareTest(object): 'auth_uri': 'https://keystone.example.com:1234', } middleware = auth_token.AuthProtocol(self.fake_app, conf) - self.assertEquals(middleware.token_revocation_list_cache_timeout, - datetime.timedelta(seconds=24)) + self.assertEqual(middleware.token_revocation_list_cache_timeout, + datetime.timedelta(seconds=24)) def test_http_error_not_cached_token(self): """Test to don't cache token as invalid on network errors. diff --git a/keystoneclient/tests/v2_0/test_access.py b/keystoneclient/tests/v2_0/test_access.py index 896803e8b..e097120e8 100644 --- a/keystoneclient/tests/v2_0/test_access.py +++ b/keystoneclient/tests/v2_0/test_access.py @@ -35,16 +35,16 @@ class AccessInfoTest(utils.TestCase): self.assertIn('serviceCatalog', auth_ref) self.assertFalse(auth_ref['serviceCatalog']) - self.assertEquals(auth_ref.auth_token, - '3e2813b7ba0b4006840c3825860b86ed') - self.assertEquals(auth_ref.username, 'exampleuser') - self.assertEquals(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(auth_ref.auth_token, + '3e2813b7ba0b4006840c3825860b86ed') + self.assertEqual(auth_ref.username, 'exampleuser') + self.assertEqual(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(auth_ref.tenant_name, None) - self.assertEquals(auth_ref.tenant_id, None) + self.assertEqual(auth_ref.tenant_name, None) + self.assertEqual(auth_ref.tenant_id, None) - self.assertEquals(auth_ref.auth_url, None) - self.assertEquals(auth_ref.management_url, None) + self.assertEqual(auth_ref.auth_url, None) + self.assertEqual(auth_ref.management_url, None) self.assertFalse(auth_ref.scoped) self.assertFalse(auth_ref.domain_scoped) @@ -56,8 +56,8 @@ class AccessInfoTest(utils.TestCase): self.assertEqual(auth_ref.user_domain_id, 'default') self.assertEqual(auth_ref.user_domain_name, 'Default') - self.assertEquals(auth_ref.expires, timeutils.parse_isotime( - UNSCOPED_TOKEN['access']['token']['expires'])) + self.assertEqual(auth_ref.expires, timeutils.parse_isotime( + UNSCOPED_TOKEN['access']['token']['expires'])) def test_will_expire_soon(self): expires = timeutils.utcnow() + datetime.timedelta(minutes=5) @@ -75,22 +75,20 @@ class AccessInfoTest(utils.TestCase): self.assertIn('serviceCatalog', auth_ref) self.assertTrue(auth_ref['serviceCatalog']) - self.assertEquals(auth_ref.auth_token, - '04c7d5ffaeef485f9dc69c06db285bdb') - self.assertEquals(auth_ref.username, 'exampleuser') - self.assertEquals(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(auth_ref.auth_token, + '04c7d5ffaeef485f9dc69c06db285bdb') + self.assertEqual(auth_ref.username, 'exampleuser') + self.assertEqual(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(auth_ref.tenant_name, 'exampleproject') - self.assertEquals(auth_ref.tenant_id, - '225da22d3ce34b15877ea70b2a575f58') + self.assertEqual(auth_ref.tenant_name, 'exampleproject') + self.assertEqual(auth_ref.tenant_id, + '225da22d3ce34b15877ea70b2a575f58') - self.assertEquals(auth_ref.tenant_name, auth_ref.project_name) - self.assertEquals(auth_ref.tenant_id, auth_ref.project_id) + self.assertEqual(auth_ref.tenant_name, auth_ref.project_name) + self.assertEqual(auth_ref.tenant_id, auth_ref.project_id) - self.assertEquals(auth_ref.auth_url, - ('http://public.com:5000/v2.0',)) - self.assertEquals(auth_ref.management_url, - ('http://admin:35357/v2.0',)) + self.assertEqual(auth_ref.auth_url, ('http://public.com:5000/v2.0',)) + self.assertEqual(auth_ref.management_url, ('http://admin:35357/v2.0',)) self.assertEqual(auth_ref.project_domain_id, 'default') self.assertEqual(auth_ref.project_domain_name, 'Default') @@ -105,21 +103,21 @@ class AccessInfoTest(utils.TestCase): auth_ref = access.AccessInfo.factory(body=DIABLO_TOKEN) self.assertTrue(auth_ref) - self.assertEquals(auth_ref.username, 'user_name1') - self.assertEquals(auth_ref.project_id, 'tenant_id1') - self.assertEquals(auth_ref.project_name, 'tenant_id1') - self.assertEquals(auth_ref.project_domain_id, 'default') - self.assertEquals(auth_ref.project_domain_name, 'Default') - self.assertEquals(auth_ref.user_domain_id, 'default') - self.assertEquals(auth_ref.user_domain_name, 'Default') + self.assertEqual(auth_ref.username, 'user_name1') + self.assertEqual(auth_ref.project_id, 'tenant_id1') + self.assertEqual(auth_ref.project_name, 'tenant_id1') + self.assertEqual(auth_ref.project_domain_id, 'default') + self.assertEqual(auth_ref.project_domain_name, 'Default') + self.assertEqual(auth_ref.user_domain_id, 'default') + self.assertEqual(auth_ref.user_domain_name, 'Default') self.assertFalse(auth_ref.scoped) def test_grizzly_token(self): auth_ref = access.AccessInfo.factory(body=GRIZZLY_TOKEN) - self.assertEquals(auth_ref.project_id, 'tenant_id1') - self.assertEquals(auth_ref.project_name, 'tenant_name1') - self.assertEquals(auth_ref.project_domain_id, 'default') - self.assertEquals(auth_ref.project_domain_name, 'Default') - self.assertEquals(auth_ref.user_domain_id, 'default') - self.assertEquals(auth_ref.user_domain_name, 'Default') + self.assertEqual(auth_ref.project_id, 'tenant_id1') + self.assertEqual(auth_ref.project_name, 'tenant_name1') + self.assertEqual(auth_ref.project_domain_id, 'default') + self.assertEqual(auth_ref.project_domain_name, 'Default') + self.assertEqual(auth_ref.user_domain_id, 'default') + self.assertEqual(auth_ref.user_domain_name, 'Default') diff --git a/keystoneclient/tests/v2_0/test_client.py b/keystoneclient/tests/v2_0/test_client.py index 3cf0ffc92..3172af7c9 100644 --- a/keystoneclient/tests/v2_0/test_client.py +++ b/keystoneclient/tests/v2_0/test_client.py @@ -69,7 +69,7 @@ class KeystoneClientTest(utils.TestCase): self.assertFalse(new_client.auth_ref.domain_scoped) self.assertIsNone(new_client.auth_ref.trust_id) self.assertFalse(new_client.auth_ref.trust_scoped) - self.assertEquals(new_client.username, 'exampleuser') + self.assertEqual(new_client.username, 'exampleuser') self.assertIsNone(new_client.password) self.assertEqual(new_client.management_url, 'http://admin:35357/v2.0') @@ -93,8 +93,8 @@ class KeystoneClientTest(utils.TestCase): self.assertFalse(new_client.auth_ref.domain_scoped) self.assertIsNone(new_client.auth_ref.trust_id) self.assertFalse(new_client.auth_ref.trust_scoped) - self.assertEquals(new_client.auth_url, new_auth_url) - self.assertEquals(new_client.username, 'exampleuser') + self.assertEqual(new_client.auth_url, new_auth_url) + self.assertEqual(new_client.username, 'exampleuser') self.assertIsNone(new_client.password) self.assertEqual(new_client.management_url, 'http://admin:35357/v2.0') diff --git a/keystoneclient/tests/v2_0/test_discovery.py b/keystoneclient/tests/v2_0/test_discovery.py index fed61d4b4..2ad23c78e 100644 --- a/keystoneclient/tests/v2_0/test_discovery.py +++ b/keystoneclient/tests/v2_0/test_discovery.py @@ -64,7 +64,7 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): self.assertIsInstance(versions, dict) self.assertIn('message', versions) self.assertIn('v2.0', versions) - self.assertEquals( + self.assertEqual( versions['v2.0']['url'], self.TEST_RESPONSE_DICT['versions']['values'][0]['links'][0] ['href']) @@ -79,7 +79,7 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): self.assertIsInstance(versions, dict) self.assertIn('message', versions) self.assertIn('v2.0', versions) - self.assertEquals( + self.assertEqual( versions['v2.0']['url'], self.TEST_RESPONSE_DICT['versions']['values'][0]['links'][0] ['href']) diff --git a/keystoneclient/tests/v2_0/test_service_catalog.py b/keystoneclient/tests/v2_0/test_service_catalog.py index 07f300402..08212472f 100644 --- a/keystoneclient/tests/v2_0/test_service_catalog.py +++ b/keystoneclient/tests/v2_0/test_service_catalog.py @@ -29,12 +29,12 @@ class ServiceCatalogTest(utils.TestCase): auth_ref = access.AccessInfo.factory(None, self.AUTH_RESPONSE_BODY) sc = auth_ref.service_catalog - self.assertEquals(sc.url_for(service_type='compute'), - "https://compute.north.host/v1/1234") - self.assertEquals(sc.url_for('tenantId', '1', service_type='compute'), - "https://compute.north.host/v1/1234") - self.assertEquals(sc.url_for('tenantId', '2', service_type='compute'), - "https://compute.north.host/v1.1/3456") + self.assertEqual(sc.url_for(service_type='compute'), + "https://compute.north.host/v1/1234") + self.assertEqual(sc.url_for('tenantId', '1', service_type='compute'), + "https://compute.north.host/v1/1234") + self.assertEqual(sc.url_for('tenantId', '2', service_type='compute'), + "https://compute.north.host/v1.1/3456") self.assertRaises(exceptions.EndpointNotFound, sc.url_for, "region", "South", service_type='compute') @@ -44,10 +44,10 @@ class ServiceCatalogTest(utils.TestCase): sc = auth_ref.service_catalog public_ep = sc.get_endpoints(service_type='compute', endpoint_type='publicURL') - self.assertEquals(public_ep['compute'][1]['tenantId'], '2') - self.assertEquals(public_ep['compute'][1]['versionId'], '1.1') - self.assertEquals(public_ep['compute'][1]['internalURL'], - "https://compute.north.host/v1.1/3456") + self.assertEqual(public_ep['compute'][1]['tenantId'], '2') + self.assertEqual(public_ep['compute'][1]['versionId'], '1.1') + self.assertEqual(public_ep['compute'][1]['internalURL'], + "https://compute.north.host/v1.1/3456") def test_service_catalog_regions(self): self.AUTH_RESPONSE_BODY['access']['region_name'] = "North" @@ -55,14 +55,14 @@ class ServiceCatalogTest(utils.TestCase): sc = auth_ref.service_catalog url = sc.url_for(service_type='image', endpoint_type='publicURL') - self.assertEquals(url, "https://image.north.host/v1/") + self.assertEqual(url, "https://image.north.host/v1/") self.AUTH_RESPONSE_BODY['access']['region_name'] = "South" auth_ref = access.AccessInfo.factory(None, self.AUTH_RESPONSE_BODY) sc = auth_ref.service_catalog url = sc.url_for(service_type='image', endpoint_type='internalURL') - self.assertEquals(url, "https://image-internal.south.host/v1/") + self.assertEqual(url, "https://image-internal.south.host/v1/") def test_service_catalog_empty(self): # We need to do a copy.deepcopy here since diff --git a/keystoneclient/tests/v3/test_access.py b/keystoneclient/tests/v3/test_access.py index 4bc3db6f5..69f2aaa6d 100644 --- a/keystoneclient/tests/v3/test_access.py +++ b/keystoneclient/tests/v3/test_access.py @@ -37,29 +37,29 @@ class AccessInfoTest(utils.TestCase): self.assertIn('catalog', auth_ref) self.assertFalse(auth_ref['catalog']) - self.assertEquals(auth_ref.auth_token, - '3e2813b7ba0b4006840c3825860b86ed') - self.assertEquals(auth_ref.username, 'exampleuser') - self.assertEquals(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(auth_ref.auth_token, + '3e2813b7ba0b4006840c3825860b86ed') + self.assertEqual(auth_ref.username, 'exampleuser') + self.assertEqual(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(auth_ref.project_name, None) - self.assertEquals(auth_ref.project_id, None) + self.assertEqual(auth_ref.project_name, None) + self.assertEqual(auth_ref.project_id, None) - self.assertEquals(auth_ref.auth_url, None) - self.assertEquals(auth_ref.management_url, None) + self.assertEqual(auth_ref.auth_url, None) + self.assertEqual(auth_ref.management_url, None) self.assertFalse(auth_ref.domain_scoped) self.assertFalse(auth_ref.project_scoped) - self.assertEquals(auth_ref.user_domain_id, - '4e6893b7ba0b4006840c3845660b86ed') - self.assertEquals(auth_ref.user_domain_name, 'exampledomain') + self.assertEqual(auth_ref.user_domain_id, + '4e6893b7ba0b4006840c3845660b86ed') + self.assertEqual(auth_ref.user_domain_name, 'exampledomain') self.assertIsNone(auth_ref.project_domain_id) self.assertIsNone(auth_ref.project_domain_name) - self.assertEquals(auth_ref.expires, timeutils.parse_isotime( - UNSCOPED_TOKEN['token']['expires_at'])) + self.assertEqual(auth_ref.expires, timeutils.parse_isotime( + UNSCOPED_TOKEN['token']['expires_at'])) def test_will_expire_soon(self): expires = timeutils.utcnow() + datetime.timedelta(minutes=5) @@ -79,21 +79,21 @@ class AccessInfoTest(utils.TestCase): self.assertIn('catalog', auth_ref) self.assertFalse(auth_ref['catalog']) - self.assertEquals(auth_ref.auth_token, - '3e2813b7ba0b4006840c3825860b86ed') - self.assertEquals(auth_ref.username, 'exampleuser') - self.assertEquals(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(auth_ref.auth_token, + '3e2813b7ba0b4006840c3825860b86ed') + self.assertEqual(auth_ref.username, 'exampleuser') + self.assertEqual(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(auth_ref.domain_name, 'anotherdomain') - self.assertEquals(auth_ref.domain_id, - '8e9283b7ba0b1038840c3842058b86ab') + self.assertEqual(auth_ref.domain_name, 'anotherdomain') + self.assertEqual(auth_ref.domain_id, + '8e9283b7ba0b1038840c3842058b86ab') - self.assertEquals(auth_ref.project_name, None) - self.assertEquals(auth_ref.project_id, None) + self.assertEqual(auth_ref.project_name, None) + self.assertEqual(auth_ref.project_id, None) - self.assertEquals(auth_ref.user_domain_id, - '4e6893b7ba0b4006840c3845660b86ed') - self.assertEquals(auth_ref.user_domain_name, 'exampledomain') + self.assertEqual(auth_ref.user_domain_id, + '4e6893b7ba0b4006840c3845660b86ed') + self.assertEqual(auth_ref.user_domain_name, 'exampledomain') self.assertIsNone(auth_ref.project_domain_id) self.assertIsNone(auth_ref.project_domain_name) @@ -110,33 +110,33 @@ class AccessInfoTest(utils.TestCase): self.assertIn('catalog', auth_ref) self.assertTrue(auth_ref['catalog']) - self.assertEquals(auth_ref.auth_token, - '3e2813b7ba0b4006840c3825860b86ed') - self.assertEquals(auth_ref.username, 'exampleuser') - self.assertEquals(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(auth_ref.auth_token, + '3e2813b7ba0b4006840c3825860b86ed') + self.assertEqual(auth_ref.username, 'exampleuser') + self.assertEqual(auth_ref.user_id, 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(auth_ref.domain_name, None) - self.assertEquals(auth_ref.domain_id, None) + self.assertEqual(auth_ref.domain_name, None) + self.assertEqual(auth_ref.domain_id, None) - self.assertEquals(auth_ref.project_name, 'exampleproject') - self.assertEquals(auth_ref.project_id, - '225da22d3ce34b15877ea70b2a575f58') + self.assertEqual(auth_ref.project_name, 'exampleproject') + self.assertEqual(auth_ref.project_id, + '225da22d3ce34b15877ea70b2a575f58') - self.assertEquals(auth_ref.tenant_name, auth_ref.project_name) - self.assertEquals(auth_ref.tenant_id, auth_ref.project_id) + self.assertEqual(auth_ref.tenant_name, auth_ref.project_name) + self.assertEqual(auth_ref.tenant_id, auth_ref.project_id) - self.assertEquals(auth_ref.auth_url, - ('http://public.com:5000/v3',)) - self.assertEquals(auth_ref.management_url, - ('http://admin:35357/v3',)) + self.assertEqual(auth_ref.auth_url, + ('http://public.com:5000/v3',)) + self.assertEqual(auth_ref.management_url, + ('http://admin:35357/v3',)) - self.assertEquals(auth_ref.project_domain_id, - '4e6893b7ba0b4006840c3845660b86ed') - self.assertEquals(auth_ref.project_domain_name, 'exampledomain') + self.assertEqual(auth_ref.project_domain_id, + '4e6893b7ba0b4006840c3845660b86ed') + self.assertEqual(auth_ref.project_domain_name, 'exampledomain') - self.assertEquals(auth_ref.user_domain_id, - '4e6893b7ba0b4006840c3845660b86ed') - self.assertEquals(auth_ref.user_domain_name, 'exampledomain') + self.assertEqual(auth_ref.user_domain_id, + '4e6893b7ba0b4006840c3845660b86ed') + self.assertEqual(auth_ref.user_domain_name, 'exampledomain') self.assertFalse(auth_ref.domain_scoped) self.assertTrue(auth_ref.project_scoped) diff --git a/keystoneclient/tests/v3/test_client.py b/keystoneclient/tests/v3/test_client.py index f479ef78a..ef5f111ac 100644 --- a/keystoneclient/tests/v3/test_client.py +++ b/keystoneclient/tests/v3/test_client.py @@ -35,8 +35,8 @@ class KeystoneClientTest(utils.TestCase): self.assertIsNotNone(c.auth_ref) self.assertFalse(c.auth_ref.domain_scoped) self.assertFalse(c.auth_ref.project_scoped) - self.assertEquals(c.auth_user_id, - 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(c.auth_user_id, + 'c4da488862bd435c9e6c0275a0d0e49a') @httpretty.activate def test_domain_scoped_init(self): @@ -49,10 +49,10 @@ class KeystoneClientTest(utils.TestCase): self.assertIsNotNone(c.auth_ref) self.assertTrue(c.auth_ref.domain_scoped) self.assertFalse(c.auth_ref.project_scoped) - self.assertEquals(c.auth_user_id, - 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(c.auth_domain_id, - '8e9283b7ba0b1038840c3842058b86ab') + self.assertEqual(c.auth_user_id, + 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(c.auth_domain_id, + '8e9283b7ba0b1038840c3842058b86ab') @httpretty.activate def test_project_scoped_init(self): @@ -66,10 +66,10 @@ class KeystoneClientTest(utils.TestCase): self.assertIsNotNone(c.auth_ref) self.assertFalse(c.auth_ref.domain_scoped) self.assertTrue(c.auth_ref.project_scoped) - self.assertEquals(c.auth_user_id, - 'c4da488862bd435c9e6c0275a0d0e49a') - self.assertEquals(c.auth_tenant_id, - '225da22d3ce34b15877ea70b2a575f58') + self.assertEqual(c.auth_user_id, + 'c4da488862bd435c9e6c0275a0d0e49a') + self.assertEqual(c.auth_tenant_id, + '225da22d3ce34b15877ea70b2a575f58') @httpretty.activate def test_auth_ref_load(self): @@ -84,7 +84,7 @@ class KeystoneClientTest(utils.TestCase): self.assertIsNotNone(new_client.auth_ref) self.assertFalse(new_client.auth_ref.domain_scoped) self.assertTrue(new_client.auth_ref.project_scoped) - self.assertEquals(new_client.username, 'exampleuser') + self.assertEqual(new_client.username, 'exampleuser') self.assertIsNone(new_client.password) self.assertEqual(new_client.management_url, 'http://admin:35357/v3') @@ -107,8 +107,8 @@ class KeystoneClientTest(utils.TestCase): self.assertIsNotNone(new_client.auth_ref) self.assertFalse(new_client.auth_ref.domain_scoped) self.assertTrue(new_client.auth_ref.project_scoped) - self.assertEquals(new_client.auth_url, new_auth_url) - self.assertEquals(new_client.username, 'exampleuser') + self.assertEqual(new_client.auth_url, new_auth_url) + self.assertEqual(new_client.username, 'exampleuser') self.assertIsNone(new_client.password) self.assertEqual(new_client.management_url, 'http://admin:35357/v3') @@ -127,7 +127,7 @@ class KeystoneClientTest(utils.TestCase): self.assertFalse(c.auth_ref.project_scoped) self.assertEqual(c.auth_ref.trust_id, 'fe0aef') self.assertTrue(c.auth_ref.trust_scoped) - self.assertEquals(c.auth_user_id, '0ca8f6') + self.assertEqual(c.auth_user_id, '0ca8f6') def test_init_err_no_auth_url(self): self.assertRaises(exceptions.AuthorizationFailure, diff --git a/keystoneclient/tests/v3/test_discover.py b/keystoneclient/tests/v3/test_discover.py index 994f95921..56040f16e 100644 --- a/keystoneclient/tests/v3/test_discover.py +++ b/keystoneclient/tests/v3/test_discover.py @@ -77,11 +77,11 @@ class DiscoverKeystoneTests(utils.UnauthenticatedTestCase): self.assertIsInstance(versions, dict) self.assertIn('message', versions) self.assertIn('v3.0', versions) - self.assertEquals( + self.assertEqual( versions['v3.0']['url'], self.TEST_RESPONSE_DICT['versions']['values'][0]['links'][0] ['href']) - self.assertEquals( + self.assertEqual( versions['v2.0']['url'], self.TEST_RESPONSE_DICT['versions']['values'][1]['links'][0] ['href']) diff --git a/keystoneclient/tests/v3/test_service_catalog.py b/keystoneclient/tests/v3/test_service_catalog.py index 18d8109d9..2752f3afb 100644 --- a/keystoneclient/tests/v3/test_service_catalog.py +++ b/keystoneclient/tests/v3/test_service_catalog.py @@ -33,11 +33,11 @@ class ServiceCatalogTest(utils.TestCase): self.AUTH_RESPONSE_BODY) sc = auth_ref.service_catalog - self.assertEquals(sc.url_for(service_type='compute'), - "https://compute.north.host/novapi/public") - self.assertEquals(sc.url_for(service_type='compute', - endpoint_type='internal'), - "https://compute.north.host/novapi/internal") + self.assertEqual(sc.url_for(service_type='compute'), + "https://compute.north.host/novapi/public") + self.assertEqual(sc.url_for(service_type='compute', + endpoint_type='internal'), + "https://compute.north.host/novapi/internal") self.assertRaises(exceptions.EndpointNotFound, sc.url_for, "region", "South", service_type='compute') @@ -49,9 +49,9 @@ class ServiceCatalogTest(utils.TestCase): public_ep = sc.get_endpoints(service_type='compute', endpoint_type='public') - self.assertEquals(public_ep['compute'][0]['region'], 'North') - self.assertEquals(public_ep['compute'][0]['url'], - "https://compute.north.host/novapi/public") + self.assertEqual(public_ep['compute'][0]['region'], 'North') + self.assertEqual(public_ep['compute'][0]['url'], + "https://compute.north.host/novapi/public") def test_service_catalog_regions(self): self.AUTH_RESPONSE_BODY['token']['region_name'] = "North" @@ -60,14 +60,14 @@ class ServiceCatalogTest(utils.TestCase): sc = auth_ref.service_catalog url = sc.url_for(service_type='image', endpoint_type='public') - self.assertEquals(url, "http://glance.north.host/glanceapi/public") + self.assertEqual(url, "http://glance.north.host/glanceapi/public") self.AUTH_RESPONSE_BODY['token']['region_name'] = "South" auth_ref = access.AccessInfo.factory(self.RESPONSE, self.AUTH_RESPONSE_BODY) sc = auth_ref.service_catalog url = sc.url_for(service_type='image', endpoint_type='internal') - self.assertEquals(url, "http://glance.south.host/glanceapi/internal") + self.assertEqual(url, "http://glance.south.host/glanceapi/internal") def test_service_catalog_empty(self): # We need to do a copy.deepcopy here since