diff options
author | Masayuki Igawa <masayuki@igawa.me> | 2017-04-10 14:49:29 +0900 |
---|---|---|
committer | Felipe Monteiro <felipe.monteiro@att.com> | 2017-06-05 23:43:53 +0100 |
commit | f9009b486946dbe38507b1a6b8c73e4dcad9a0ed (patch) | |
tree | 5434dc26499d35c5ea4680475bbb2c8dc91800ce /tempest/api/identity/admin | |
parent | d8ab06b17cb9656b6506e88d9b6c186a25fbc65d (diff) | |
download | tempest-f9009b486946dbe38507b1a6b8c73e4dcad9a0ed.tar.gz |
Use assert(Not)Empty,IsNotNone instead of assert(Not)Equal,GreaterEqual(0, len(..
This commit makes to use assert(Not)Empty() or assertIsNotNone() instead
of assert(Not)Equal(0, len(LIST),..) or assertGreaterEqual(0, len()...).
The original code asserts the specified list is empty or not. And we
already have assert(Not)Empty() for it. The method names
"assert(Not)Empty" are straightforward and easy to understand. It makes
the code clean and the assert message could be easier to understand what
is happen than original ones.
Change-Id: I715ec84d9139b1d196275e91212ab40d52a545e1
Diffstat (limited to 'tempest/api/identity/admin')
-rw-r--r-- | tempest/api/identity/admin/v2/test_endpoints.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v2/test_users.py | 4 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_credentials.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_domains.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_endpoints.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_list_users.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_policies.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_regions.py | 2 | ||||
-rw-r--r-- | tempest/api/identity/admin/v3/test_users.py | 2 |
9 files changed, 10 insertions, 10 deletions
diff --git a/tempest/api/identity/admin/v2/test_endpoints.py b/tempest/api/identity/admin/v2/test_endpoints.py index db32f5a4d..59fc4d8c7 100644 --- a/tempest/api/identity/admin/v2/test_endpoints.py +++ b/tempest/api/identity/admin/v2/test_endpoints.py @@ -62,7 +62,7 @@ class EndPointsTestJSON(base.BaseIdentityV2AdminTest): # Asserting LIST endpoints missing_endpoints =\ [e for e in self.setup_endpoints if e not in fetched_endpoints] - self.assertEqual(0, len(missing_endpoints), + self.assertEmpty(missing_endpoints, "Failed to find endpoint %s in fetched list" % ', '.join(str(e) for e in missing_endpoints)) diff --git a/tempest/api/identity/admin/v2/test_users.py b/tempest/api/identity/admin/v2/test_users.py index 2711a2dea..0d98af5fa 100644 --- a/tempest/api/identity/admin/v2/test_users.py +++ b/tempest/api/identity/admin/v2/test_users.py @@ -141,7 +141,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): # verifying the user Id in the list missing_users =\ [user for user in user_ids if user not in fetched_user_ids] - self.assertEqual(0, len(missing_users), + self.assertEmpty(missing_users, "Failed to find user %s in fetched list" % ', '.join(m_user for m_user in missing_users)) @@ -169,7 +169,7 @@ class UsersTestJSON(base.BaseIdentityV2AdminTest): # verifying the user Id in the list missing_users = [missing_user for missing_user in user_ids if missing_user not in fetched_user_ids] - self.assertEqual(0, len(missing_users), + self.assertEmpty(missing_users, "Failed to find user %s in fetched list" % ', '.join(m_user for m_user in missing_users)) diff --git a/tempest/api/identity/admin/v3/test_credentials.py b/tempest/api/identity/admin/v3/test_credentials.py index 75e877a4d..15b20081e 100644 --- a/tempest/api/identity/admin/v3/test_credentials.py +++ b/tempest/api/identity/admin/v3/test_credentials.py @@ -107,6 +107,6 @@ class CredentialsTestJSON(base.BaseIdentityV3AdminTest): fetched_cred_ids.append(i['id']) missing_creds = [c for c in created_cred_ids if c not in fetched_cred_ids] - self.assertEqual(0, len(missing_creds), + self.assertEmpty(missing_creds, "Failed to find cred %s in fetched list" % ', '.join(m_cred for m_cred in missing_creds)) diff --git a/tempest/api/identity/admin/v3/test_domains.py b/tempest/api/identity/admin/v3/test_domains.py index cddba538c..9fe978c9d 100644 --- a/tempest/api/identity/admin/v3/test_domains.py +++ b/tempest/api/identity/admin/v3/test_domains.py @@ -57,7 +57,7 @@ class DomainsTestJSON(base.BaseIdentityV3AdminTest): fetched_ids.append(d['id']) missing_doms = [d for d in self.setup_domains if d['id'] not in fetched_ids] - self.assertEqual(0, len(missing_doms)) + self.assertEmpty(missing_doms) @decorators.idempotent_id('c6aee07b-4981-440c-bb0b-eb598f58ffe9') def test_list_domains_filter_by_name(self): diff --git a/tempest/api/identity/admin/v3/test_endpoints.py b/tempest/api/identity/admin/v3/test_endpoints.py index 09f92e2a7..b1ae2aa9e 100644 --- a/tempest/api/identity/admin/v3/test_endpoints.py +++ b/tempest/api/identity/admin/v3/test_endpoints.py @@ -64,7 +64,7 @@ class EndPointsTestJSON(base.BaseIdentityV3AdminTest): # Asserting LIST endpoints missing_endpoints =\ [e for e in self.setup_endpoints if e not in fetched_endpoints] - self.assertEqual(0, len(missing_endpoints), + self.assertEmpty(missing_endpoints, "Failed to find endpoint %s in fetched list" % ', '.join(str(e) for e in missing_endpoints)) diff --git a/tempest/api/identity/admin/v3/test_list_users.py b/tempest/api/identity/admin/v3/test_list_users.py index bcbf6b6fa..47a358068 100644 --- a/tempest/api/identity/admin/v3/test_list_users.py +++ b/tempest/api/identity/admin/v3/test_list_users.py @@ -93,7 +93,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): fetched_ids = [u['id'] for u in body] missing_users = [u['id'] for u in self.users if u['id'] not in fetched_ids] - self.assertEqual(0, len(missing_users), + self.assertEmpty(missing_users, "Failed to find user %s in fetched list" % ', '.join(m_user for m_user in missing_users)) diff --git a/tempest/api/identity/admin/v3/test_policies.py b/tempest/api/identity/admin/v3/test_policies.py index 730d4698c..960e2cb12 100644 --- a/tempest/api/identity/admin/v3/test_policies.py +++ b/tempest/api/identity/admin/v3/test_policies.py @@ -41,7 +41,7 @@ class PoliciesTestJSON(base.BaseIdentityV3AdminTest): for p in body: fetched_ids.append(p['id']) missing_pols = [p for p in policy_ids if p not in fetched_ids] - self.assertEqual(0, len(missing_pols)) + self.assertEmpty(missing_pols) @decorators.attr(type='smoke') @decorators.idempotent_id('e544703a-2f03-4cf2-9b0f-350782fdb0d3') diff --git a/tempest/api/identity/admin/v3/test_regions.py b/tempest/api/identity/admin/v3/test_regions.py index ac550a73a..d00e40811 100644 --- a/tempest/api/identity/admin/v3/test_regions.py +++ b/tempest/api/identity/admin/v3/test_regions.py @@ -98,7 +98,7 @@ class RegionsTestJSON(base.BaseIdentityV3AdminTest): missing_regions =\ [e for e in self.setup_regions if e not in fetched_regions] # Asserting List Regions response - self.assertEqual(0, len(missing_regions), + self.assertEmpty(missing_regions, "Failed to find region %s in fetched list" % ', '.join(str(e) for e in missing_regions)) diff --git a/tempest/api/identity/admin/v3/test_users.py b/tempest/api/identity/admin/v3/test_users.py index 751962fc4..409d4f837 100644 --- a/tempest/api/identity/admin/v3/test_users.py +++ b/tempest/api/identity/admin/v3/test_users.py @@ -131,7 +131,7 @@ class UsersV3TestJSON(base.BaseIdentityV3AdminTest): missing_projects =\ [p for p in assigned_project_ids if p not in fetched_project_ids] - self.assertEqual(0, len(missing_projects), + self.assertEmpty(missing_projects, "Failed to find project %s in fetched list" % ', '.join(m_project for m_project in missing_projects)) |