Fixes data and content-type headers in no content POST requests for objects

[pithos] / pithos / api / tests.py

diff --git a/pithos/api/tests.py b/pithos/api/tests.py
index c38ee84..6ec235c 100644 (file)
--- a/pithos/api/tests.py
+++ b/pithos/api/tests.py
@@ -50,7 +50,7 @@ DATE_FORMATS = ["%a %b %d %H:%M:%S %Y",
 
 class AaiClient(Client):
     def request(self, **request):
-        request['HTTP_X_AUTH_TOKEN'] = '46e427d657b20defe352804f0eb6f8a2'
+        request['HTTP_X_AUTH_TOKEN'] = '0000'
         return super(AaiClient, self).request(**request)
 
 class BaseTestCase(TestCase):
@@ -83,6 +83,7 @@ class BaseTestCase(TestCase):
                 'Date',
                 'X-Object-Manifest',
                 'Content-Range',
+                'X-Object-Modified-By',
                 'X-Object-Version',
                 'X-Object-Version-Timestamp',)}
         self.contentTypes = {'xml':'application/xml',
@@ -215,7 +216,7 @@ class BaseTestCase(TestCase):
         path = '/v1/%s/%s/%s' %(account, container, name)
         response = self.client.head(path)
         response.content = response.content
-        self.assert_status(response, 204)
+        self.assert_status(response, 200)
         return response
 
     def get_object(self, account, container, name, format='', **headers):
@@ -253,8 +254,8 @@ class BaseTestCase(TestCase):
         self.assert_status(response, 201)
         return response
 
-    def update_object(self, account, container, name, data={},
-                      content_type='MULTIPART_CONTENT', **headers):
+    def update_object(self, account, container, name, data='',
+                      content_type='', **headers):
         path = '/v1/%s/%s/%s' %(account, container, name)
         response = self.client.post(path, data, content_type, **headers)
         response.content = response.content
@@ -669,6 +670,7 @@ class ContainerGet(BaseTestCase):
         r = self.update_object(self.account,
                                     self.container[0],
                                     self.obj[0]['name'],
+                                    
                                     **meta)
         r = self.list_objects(self.account,
                           self.container[0],
@@ -1423,7 +1425,7 @@ class ObjectCopy(BaseTestCase):
             #assert src object still exists
             r = self.get_object_meta(self.account, self.containers[0],
                                      self.obj['name'])
-            self.assertEqual(r.status_code, 204)
+            self.assertEqual(r.status_code, 200)
 
     def test_copy_from_different_container(self):
         with AssertInvariant(self.get_object_meta,
@@ -1449,7 +1451,7 @@ class ObjectCopy(BaseTestCase):
             #assert src object still exists
             r = self.get_object_meta(self.account, self.containers[0],
                                      self.obj['name'])
-            self.assertEqual(r.status_code, 204)
+            self.assertEqual(r.status_code, 200)
 
     def test_copy_invalid(self):
         #copy from invalid object
@@ -1559,7 +1561,7 @@ class ObjectPost(BaseTestCase):
                                 **more)
         
         if partial < 0 or (instance_length and l <= last_byte_pos):
-            self.assertEqual(r.status_code, 202)    
+            self.assertEqual(r.status_code, 416)    
         elif content_length and content_length != partial:
             self.assertEqual(r.status_code, 400)
         else: