openstack/swift
Code Issues Proposed changes

Merge "Handle deleted files with if-none-match"

Browse Source
This commit is contained in:
Jenkins 2016-11-24 08:11:28 +00:00 committed by Gerrit Code Review
commit 7840f9450d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swift/obj/server.py
View File

@ -686,7 +686,7 @@ class ObjectController(BaseStorageServer):
except DiskFileXattrNotSupported:
return HTTPInsufficientStorage(drive=device, request=request)
except DiskFileDeleted as e:
orig_metadata = e.metadata
orig_metadata = {}
orig_timestamp = e.timestamp
except (DiskFileNotExist, DiskFileQuarantined):
orig_metadata = {}

13
test/functional/test_object.py
View File

@ -273,6 +273,12 @@ class TestObject(unittest2.TestCase):
})
def test_if_none_match(self):
def delete(url, token, parsed, conn):
conn.request('DELETE', '%s/%s/%s' % (
parsed.path, self.container, 'if_none_match_test'), '',
{'X-Auth-Token': token})
return check_response(conn)
def put(url, token, parsed, conn):
conn.request('PUT', '%s/%s/%s' % (
parsed.path, self.container, 'if_none_match_test'), '',
@ -287,6 +293,13 @@ class TestObject(unittest2.TestCase):
resp.read()
self.assertEqual(resp.status, 412)
resp = retry(delete)
resp.read()
self.assertEqual(resp.status, 204)
resp = retry(put)
resp.read()
self.assertEqual(resp.status, 201)
def put(url, token, parsed, conn):
conn.request('PUT', '%s/%s/%s' % (
parsed.path, self.container, 'if_none_match_test'), '',