openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Replace assertEqual(None, *) with assertIsNone in tests"

Browse Source
This commit is contained in:
Jenkins
2014-02-20 06:33:38 +00:00
committed by Gerrit Code Review
parent 18539b5631 e8f2631b91
commit c0165b1a88
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/tests/test_base.py
View File

@@ -72,7 +72,7 @@ class BaseTest(utils.TestCase):
def test_human_id(self):
r = base.Resource(None, {"name": "1 of !"})
self.assertEqual(r.human_id, None)
self.assertIsNone(r.human_id)
r = HumanReadable(None, {"name": "1 of !"})
self.assertEqual(r.human_id, "1-of")

8
keystoneclient/tests/v2_0/test_access.py
View File

@@ -44,11 +44,11 @@ class AccessInfoTest(utils.TestCase, testresources.ResourcedTestCase):
self.assertEqual(auth_ref.role_names, [])
self.assertEqual(auth_ref.tenant_name, None)
self.assertEqual(auth_ref.tenant_id, None)
self.assertIsNone(auth_ref.tenant_name)
self.assertIsNone(auth_ref.tenant_id)
self.assertEqual(auth_ref.auth_url, None)
self.assertEqual(auth_ref.management_url, None)
self.assertIsNone(auth_ref.auth_url)
self.assertIsNone(auth_ref.management_url)
self.assertFalse(auth_ref.scoped)
self.assertFalse(auth_ref.domain_scoped)

2
keystoneclient/tests/v2_0/test_service_catalog.py
View File

@@ -136,7 +136,7 @@ class ServiceCatalogTest(utils.TestCase):
self.assertEqual(urls[0], 'https://image.south.host/v1/')
urls = sc.get_urls(service_type='image', region_name='West')
self.assertEqual(urls, None)
self.assertIsNone(urls)
def test_service_catalog_param_overrides_body_region(self):
self.AUTH_RESPONSE_BODY['access']['region_name'] = "North"

2
keystoneclient/tests/v3/test_service_catalog.py
View File

@@ -151,7 +151,7 @@ class ServiceCatalogTest(utils.TestCase):
self.assertEqual(urls[0], self.south_endpoints['public'])
urls = sc.get_urls(service_type='image', region_name='West')
self.assertEqual(urls, None)
self.assertIsNone(urls)
def test_service_catalog_param_overrides_body_region(self):
self.AUTH_RESPONSE_BODY['token']['region_name'] = "North"