openstack/horizon
Code Issues Proposed changes

Merge "Add missing content-length header"

Browse Source
This commit is contained in:
Jenkins
2015-06-24 14:35:07 +00:00
committed by Gerrit Code Review
parent 8a31dc9271 8201d65cf9
commit c76ace1ac8
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
openstack_dashboard/api/swift.py
View File

@@ -286,6 +286,7 @@ def swift_upload_object(request, container_name, object_name,
etag = swift_api(request).put_object(container_name,
object_name,
object_file,
content_length=size,
headers=headers)
obj_info = {'name': object_name, 'bytes': size, 'etag': etag}

5
openstack_dashboard/test/api_tests/swift_tests.py
View File

@@ -184,16 +184,18 @@ class SwiftApiTests(test.APITestCase):
headers = {'X-Object-Meta-Orig-Filename': fake_name}
swift_api = self.stub_swiftclient()
test_file = FakeFile()
swift_api.put_object(container.name,
obj.name,
IsA(FakeFile),
content_length=test_file.size,
headers=headers)
self.mox.ReplayAll()
api.swift.swift_upload_object(self.request,
container.name,
obj.name,
FakeFile())
test_file)
def test_swift_upload_object_without_file(self):
container = self.containers.first()
@@ -203,6 +205,7 @@ class SwiftApiTests(test.APITestCase):
swift_api.put_object(container.name,
obj.name,
None,
content_length=0,
headers={})
self.mox.ReplayAll()