From bda43e0469fdc0b210d6d0c2336e87b8277b0ade Mon Sep 17 00:00:00 2001 From: Zhenguo Niu Date: Thu, 9 May 2013 16:47:46 +0800 Subject: [PATCH] change "int(marker)" to "marker" on user list pagination. Change-Id: I7763b2cb3a1991402cb5e909a3cbf9d49f8e9bd1 Fixes: bug 1178152 --- keystoneclient/v2_0/users.py | 2 +- tests/v2_0/test_users.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keystoneclient/v2_0/users.py b/keystoneclient/v2_0/users.py index 97dc72f73..2a741586c 100644 --- a/keystoneclient/v2_0/users.py +++ b/keystoneclient/v2_0/users.py @@ -124,7 +124,7 @@ class UserManager(base.ManagerWithFind): if limit: params['limit'] = int(limit) if marker: - params['marker'] = int(marker) + params['marker'] = marker query = "" if params: diff --git a/tests/v2_0/test_users.py b/tests/v2_0/test_users.py index 154cea5cb..35a349f4d 100644 --- a/tests/v2_0/test_users.py +++ b/tests/v2_0/test_users.py @@ -164,11 +164,11 @@ class UserTests(utils.TestCase): kwargs['headers'] = self.TEST_REQUEST_HEADERS requests.request( 'GET', - urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=1'), + urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=foo'), **kwargs).AndReturn((resp)) self.mox.ReplayAll() - user_list = self.client.users.list(marker=1) + user_list = self.client.users.list(marker='foo') [self.assertTrue(isinstance(u, users.User)) for u in user_list] def test_list_limit_marker(self): @@ -181,11 +181,11 @@ class UserTests(utils.TestCase): kwargs['headers'] = self.TEST_REQUEST_HEADERS requests.request( 'GET', - urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=1&limit=1'), + urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=foo&limit=1'), **kwargs).AndReturn((resp)) self.mox.ReplayAll() - user_list = self.client.users.list(limit=1, marker=1) + user_list = self.client.users.list(limit=1, marker='foo') [self.assertTrue(isinstance(u, users.User)) for u in user_list] def test_update(self):