openstack/swift
Code Issues Proposed changes

Fix tests; fix copy/auth problem

Browse Source
This commit is contained in:
gholt
2010-11-03 14:06:30 -07:00
parent 819bdc3066
commit ce48a3c709
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
swift/proxy/server.py
View File

@@ -629,7 +629,7 @@ class ObjectController(Controller):
return HTTPPreconditionFailed(request=req, return HTTPPreconditionFailed(request=req,
body='X-Copy-From header must be of the form' body='X-Copy-From header must be of the form'
'<container name>/<object name>') '<container name>/<object name>')
source_req = Request.blank(source_header) source_req = Request.blank(source_header, environ=req.environ)
orig_obj_name = self.object_name orig_obj_name = self.object_name
orig_container_name = self.container_name orig_container_name = self.container_name
self.object_name = src_obj_name self.object_name = src_obj_name

4
test/functionalnosetests/test_object.py
View File

@@ -120,7 +120,7 @@ class TestObject(unittest.TestCase):
'X-Copy-From': '%s/%s' % (self.container, 'X-Copy-From': '%s/%s' % (self.container,
self.obj)}) self.obj)})
return check_response(conn) return check_response(conn)
resp = retry(put, use_account=3) resp = retry(copy, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEquals(resp.status, 403)
# verify third account can write "obj1" to shared container # verify third account can write "obj1" to shared container
@@ -141,7 +141,7 @@ class TestObject(unittest.TestCase):
'X-Copy-From': '%s/%s' % (self.container, 'X-Copy-From': '%s/%s' % (self.container,
self.obj)}) self.obj)})
return check_response(conn) return check_response(conn)
resp = retry(put, use_account=3) resp = retry(copy, use_account=3)
resp.read() resp.read()
self.assertEquals(resp.status, 403) self.assertEquals(resp.status, 403)
# clean up "obj1" # clean up "obj1"