openstack
/
swift
Code Issues Proposed changes

Merge "Fixed inconsistent end_marker"

This commit is contained in:
Jenkins 2012-05-04 17:37:06 +00:00 committed by Gerrit Code Review
parent 742f3d1a8e e7d37b1a05
commit 5dcc9083a7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/common/db.py
View File

@ -1572,7 +1572,7 @@ class AccountBroker(DatabaseBroker):
WHERE deleted = 0 AND """
query_args = []
if end_marker:
query += ' name <= ? AND'
query += ' name < ? AND'
query_args.append(end_marker)
if marker and marker >= prefix:
query += ' name > ? AND'

4
test/unit/common/test_db.py
View File

@ -1814,9 +1814,9 @@ class TestAccountBroker(unittest.TestCase):
self.assertEquals(listing[-1][0], '0/0099')
listing = broker.list_containers_iter(100, '', '0/0050', None, '')
self.assertEquals(len(listing), 51)
self.assertEquals(len(listing), 50)
self.assertEquals(listing[0][0], '0/0000')
self.assertEquals(listing[-1][0], '0/0050')
self.assertEquals(listing[-1][0], '0/0049')
listing = broker.list_containers_iter(100, '0/0099', None, None, '')
self.assertEquals(len(listing), 100)