openstack/python-keystoneclient
Code Issues Proposed changes

change "int(marker)" to "marker" on user list pagination.

Browse Source 
Change-Id: I7763b2cb3a1991402cb5e909a3cbf9d49f8e9bd1
Fixes: bug 1178152
This commit is contained in:
Zhenguo Niu
2013-05-09 16:47:46 +08:00
parent 1130dd70df
commit bda43e0469
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/v2_0/users.py
View File

@@ -124,7 +124,7 @@ class UserManager(base.ManagerWithFind):
if limit: if limit:
params['limit'] = int(limit) params['limit'] = int(limit)
if marker: if marker:
params['marker'] = int(marker) params['marker'] = marker
query = "" query = ""
if params: if params:

8
tests/v2_0/test_users.py
View File

@@ -164,11 +164,11 @@ class UserTests(utils.TestCase):
kwargs['headers'] = self.TEST_REQUEST_HEADERS kwargs['headers'] = self.TEST_REQUEST_HEADERS
requests.request( requests.request(
'GET', 'GET',
urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=1'), urlparse.urljoin(self.TEST_URL, 'v2.0/users?marker=foo'),
**kwargs).AndReturn((resp)) **kwargs).AndReturn((resp))
self.mox.ReplayAll() 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] [self.assertTrue(isinstance(u, users.User)) for u in user_list]
def test_list_limit_marker(self): def test_list_limit_marker(self):
@@ -181,11 +181,11 @@ class UserTests(utils.TestCase):
kwargs['headers'] = self.TEST_REQUEST_HEADERS kwargs['headers'] = self.TEST_REQUEST_HEADERS
requests.request( requests.request(
'GET', '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)) **kwargs).AndReturn((resp))
self.mox.ReplayAll() 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] [self.assertTrue(isinstance(u, users.User)) for u in user_list]
def test_update(self): def test_update(self):