openstack/swift
Code Issues Proposed changes

Merge "Included sysmeta in the object info"

Browse Source
This commit is contained in:
Jenkins 2015-02-10 04:51:39 +00:00 committed by Gerrit Code Review
commit 00d059c9be
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swift/proxy/controllers/base.py
View File

@ -185,7 +185,8 @@ def headers_to_object_info(headers, status_int=HTTP_OK):
'length': headers.get('content-length'),
'type': headers.get('content-type'),
'etag': headers.get('etag'),
'meta': meta
'meta': meta,
'sysmeta': sysmeta
}
return info

9
test/unit/proxy/controllers/test_base.py
View File

@ -523,6 +523,15 @@ class TestFuncs(unittest.TestCase):
self.assertEquals(resp['meta']['whatevs'], 14)
self.assertEquals(resp['meta']['somethingelse'], 0)
def test_headers_to_object_info_sys_meta(self):
prefix = get_sys_meta_prefix('object')
headers = {'%sWhatevs' % prefix: 14,
'%ssomethingelse' % prefix: 0}
resp = headers_to_object_info(headers.items(), 200)
self.assertEquals(len(resp['sysmeta']), 2)
self.assertEquals(resp['sysmeta']['whatevs'], 14)
self.assertEquals(resp['sysmeta']['somethingelse'], 0)
def test_headers_to_object_info_values(self):
headers = {
'content-length': '1024',