openstack
/
swift
Code Issues Proposed changes

Merge "Check marker params in SimpleClient full listing requests"

This commit is contained in:
Jenkins 2016-03-24 20:20:19 +00:00 committed by Gerrit Code Review
parent 9c014e855c 2f24fb9683
commit e0bac5e9e8
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
swift/common/internal_client.py
View File

@ -747,18 +747,18 @@ class SimpleClient(object):
url = self.url
if full_listing:
body_data = self.base_request(method, container, name, prefix,
headers, proxy, timeout=timeout,
marker=marker)
listing = body_data[1]
info, body_data = self.base_request(
method, container, name, prefix, headers, proxy,
timeout=timeout, marker=marker)
listing = body_data
while listing:
marker = listing[-1]['name']
listing = self.base_request(method, container, name, prefix,
headers, proxy, timeout=timeout,
marker=marker)[1]
info, listing = self.base_request(
method, container, name, prefix, headers, proxy,
timeout=timeout, marker=marker)
if listing:
body_data[1].extend(listing)
return body_data
body_data.extend(listing)
return [info, body_data]
if headers is None:
headers = {}

50
test/unit/common/test_internal_client.py
View File

@ -34,6 +34,19 @@ from test.unit import with_tempdir, write_fake_ring, patch_policies
from test.unit.common.middleware.helpers import FakeSwift
class FakeConn(object):
def __init__(self, body=None):
if body is None:
body = []
self.body = body
def read(self):
return json.dumps(self.body)
def info(self):
return {}
def not_sleep(seconds):
pass
@ -339,17 +352,10 @@ class TestInternalClient(unittest.TestCase):
# verify that base_request passes timeout arg on to urlopen
body = {"some": "content"}
class FakeConn(object):
def read(self):
return json.dumps(body)
def info(self):
return {}
for timeout in (0.0, 42.0, None):
mocked_func = 'swift.common.internal_client.urllib2.urlopen'
with mock.patch(mocked_func) as mock_urlopen:
mock_urlopen.side_effect = [FakeConn()]
mock_urlopen.side_effect = [FakeConn(body)]
sc = internal_client.SimpleClient('http://0.0.0.0/')
_, resp_body = sc.base_request('GET', timeout=timeout)
mock_urlopen.assert_called_once_with(mock.ANY, timeout=timeout)
@ -361,23 +367,21 @@ class TestInternalClient(unittest.TestCase):
body2 = [{'name': 'd'}]
body3 = []
class FakeConn(object):
def __init__(self, body):
self.body = body
def read(self):
return json.dumps(self.body)
def info(self):
return {}
mocked_func = 'swift.common.internal_client.urllib2.urlopen'
with mock.patch(mocked_func) as mock_urlopen:
mock_urlopen.side_effect = [
FakeConn(body1), FakeConn(body2), FakeConn(body3)]
sc = internal_client.SimpleClient('http://0.0.0.0/')
_, resp_body = sc.base_request('GET', full_listing=True)
self.assertEqual(body1 + body2, resp_body)
self.assertEqual(body1 + body2, resp_body)
self.assertEqual(3, mock_urlopen.call_count)
actual_requests = map(
lambda call: call[0][0], mock_urlopen.call_args_list)
self.assertEqual('/?format=json', actual_requests[0].get_selector())
self.assertEqual(
'/?format=json&marker=c', actual_requests[1].get_selector())
self.assertEqual(
'/?format=json&marker=d', actual_requests[2].get_selector())
def test_make_request_method_path_headers(self):
class InternalClient(internal_client.InternalClient):
@ -1415,14 +1419,6 @@ class TestSimpleClient(unittest.TestCase):
proxy = '%s://%s' % (scheme, proxy_host)
url = 'https://127.0.0.1:1/a'
class FakeConn(object):
def read(self):
return 'irrelevant'
def info(self):
return {}
mocked = 'swift.common.internal_client.urllib2.urlopen'
# module level methods