From 9bc1817185bb5e085408d7f9c888bdbe675e3bc3 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 9 Jan 2014 15:17:59 +0000 Subject: [PATCH] Fix incorrect assertTrue usage Several self.assertTrue(len(returned_list)) statements exist, which don't make any sense as we're testing an integer length as a boolean. Instead test the returned list length matches the list passed in to stub the request. Change-Id: I713c3a6afcc93ebb2a8f7ffde45aade2154ebf2c --- keystoneclient/tests/v3/test_groups.py | 4 ++-- keystoneclient/tests/v3/test_projects.py | 4 ++-- keystoneclient/tests/v3/test_users.py | 2 +- keystoneclient/tests/v3/utils.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keystoneclient/tests/v3/test_groups.py b/keystoneclient/tests/v3/test_groups.py index 91bb445a7..62d36672d 100644 --- a/keystoneclient/tests/v3/test_groups.py +++ b/keystoneclient/tests/v3/test_groups.py @@ -45,7 +45,7 @@ class GroupTests(utils.TestCase, utils.CrudTests): status=200, entity=ref_list) returned_list = self.manager.list(user=user_id) - self.assertTrue(len(returned_list)) + self.assertEqual(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] @httpretty.activate @@ -58,7 +58,7 @@ class GroupTests(utils.TestCase, utils.CrudTests): status=200, entity=ref_list) returned_list = self.manager.list(domain=domain_id) - self.assertTrue(len(returned_list)) + self.assertTrue(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] self.assertEqual(httpretty.last_request().querystring, diff --git a/keystoneclient/tests/v3/test_projects.py b/keystoneclient/tests/v3/test_projects.py index 6aa738361..79bf1b9d4 100644 --- a/keystoneclient/tests/v3/test_projects.py +++ b/keystoneclient/tests/v3/test_projects.py @@ -45,7 +45,7 @@ class ProjectTests(utils.TestCase, utils.CrudTests): entity=ref_list) returned_list = self.manager.list(user=user_id) - self.assertTrue(len(returned_list)) + self.assertEqual(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] @httpretty.activate @@ -57,7 +57,7 @@ class ProjectTests(utils.TestCase, utils.CrudTests): entity=ref_list) returned_list = self.manager.list(domain=domain_id) - self.assertTrue(len(returned_list)) + self.assertEqual(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] self.assertEqual(httpretty.last_request().querystring, diff --git a/keystoneclient/tests/v3/test_users.py b/keystoneclient/tests/v3/test_users.py index 0372db44e..e2ee12138 100644 --- a/keystoneclient/tests/v3/test_users.py +++ b/keystoneclient/tests/v3/test_users.py @@ -64,7 +64,7 @@ class UserTests(utils.TestCase, utils.CrudTests): entity=ref_list) returned_list = self.manager.list(group=group_id) - self.assertTrue(len(returned_list)) + self.assertEqual(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] @httpretty.activate diff --git a/keystoneclient/tests/v3/utils.py b/keystoneclient/tests/v3/utils.py index 4bad4294b..fb8229dd2 100644 --- a/keystoneclient/tests/v3/utils.py +++ b/keystoneclient/tests/v3/utils.py @@ -239,7 +239,7 @@ class CrudTests(object): body=jsonutils.dumps(self.encode(ref_list))) returned_list = self.manager.list(**filter_kwargs) - self.assertTrue(len(returned_list)) + self.assertEqual(len(ref_list), len(returned_list)) [self.assertTrue(isinstance(r, self.model)) for r in returned_list] @httpretty.activate