Unitest get_container_object_meta

diff --git a/kamaki/clients/storage.py b/kamaki/clients/storage.py
index 892dc92..f30251f 100644 (file)
--- a/kamaki/clients/storage.py
+++ b/kamaki/clients/storage.py
@@ -58,10 +58,8 @@ class StorageClient(Client):
         path = path4url(self.account)
         r = self.head(path, success=(204, 401))
         if r.status_code == 401:
-            r.release()
             raise ClientError("No authorization")
         reply = r.headers
-        r.release()
         return reply
 
     def replace_account_meta(self, metapairs):
@@ -70,7 +68,6 @@ class StorageClient(Client):
         for key, val in  metapairs:
             self.set_header('X-Account-Meta-'+key, val)
         r = self.post(path, success=202)
-        r.release()
 
     def del_account_meta(self, metakey):
         headers = self.get_account_info()
@@ -79,26 +76,21 @@ class StorageClient(Client):
             raise ClientError('X-Account-Meta-%s not found' % metakey, 404)
         path = path4url(self.account)
         r = self.post(path, success = 202)
-        r.release()
 
     def create_container(self, container):
         self.assert_account()
         path = path4url(self.account, container)
         r = self.put(path, success=(201, 202))
         if r.status_code == 202:
-            r.release()
             raise ClientError("Container already exists", r.status_code)
-        r.release()
 
     def get_container_info(self, container):
         self.assert_account()
         path = path4url(self.account, container)
         r = self.head(path, success=(204, 404))
         if r.status_code == 404:
-            r.release()
             raise ClientError("Container does not exist", r.status_code)
         reply = r.headers
-        r.release()
         return reply
 
     def delete_container(self, container):
@@ -106,12 +98,9 @@ class StorageClient(Client):
         path = path4url(self.account, container)
         r = self.delete(path, success=(204, 404, 409))
         if r.status_code == 404:
-            r.release()
             raise ClientError("Container does not exist", r.status_code)
         elif r.status_code == 409:
-            r.release()
             raise ClientError("Container is not empty", r.status_code)
-        r.release()
 
     def list_containers(self):
         self.assert_account()
@@ -119,7 +108,6 @@ class StorageClient(Client):
         path = path4url(self.account)
         r = self.get(path, success = (200, 204))
         reply = r.json
-        r.release()
         return reply
 
     def upload_object(self, object, f, size=None):
@@ -129,7 +117,6 @@ class StorageClient(Client):
         path = path4url(self.account, self.container, object)
         data = f.read(size) if size is not None else f.read()
         r = self.put(path, data=data, success=201)
-        r.release()
 
     def create_directory(self, object):
         self.assert_container()
@@ -137,14 +124,12 @@ class StorageClient(Client):
         self.set_header('Content-Type', 'application/directory')
         self.set_header('Content-length', '0')
         r = self.put(path, success=201)
-        r.release()
 
     def get_object_info(self, object):
         self.assert_container()
         path = path4url(self.account, self.container, object)
         r = self.head(path, success=200)
         reply = r.headers
-        r.release()
         return reply
 
     def get_object_meta(self, object):
@@ -160,7 +145,6 @@ class StorageClient(Client):
         self.set_header('X-Object-Meta-'+metakey, '')
         path = path4url(self.account, self.container, object)
         r = self.post(path, success = 202)
-        r.release()
 
     def replace_object_meta(self, metapairs):
         self.assert_container()
@@ -168,7 +152,6 @@ class StorageClient(Client):
         for key, val in metapairs:
             self.set_header('X-Object-Meta-'+key, val)
         r = self.post(path, success=202)
-        r.release()
 
     def get_object(self, object):
         self.assert_container()
@@ -176,7 +159,6 @@ class StorageClient(Client):
         r = self.get(path, success=200)
         size = int(r.headers['content-length'])
         cnt = r.content
-        r.release()
         return cnt, size
 
     def copy_object(self, src_container, src_object, dst_container, dst_object=False):
@@ -186,7 +168,6 @@ class StorageClient(Client):
         self.set_header('X-Copy-From', path4url(src_container, src_object))
         self.set_header('Content-Length', 0)
         r = self.put(dst_path, success=201)
-        r.release()
 
     def move_object(self, src_container, src_object, dst_container, dst_object=False):
         self.assert_account()
@@ -195,16 +176,13 @@ class StorageClient(Client):
         self.set_header('X-Move-From', path4url(src_container, src_object))
         self.set_header('Content-Length', 0)
         r = self.put(dst_path, success=201)
-        r.release()
 
     def delete_object(self, object):
         self.assert_container()
         path = path4url(self.account, self.container, object)
         r = self.delete(path, success=(204, 404))
         if r.status_code == 404:
-            r.release()
             raise ClientError("Object %s not found" %object, r.status_code)
-        r.release()
        
     def list_objects(self):
         self.assert_container()
@@ -212,13 +190,10 @@ class StorageClient(Client):
         self.set_param('format', 'json')
         r = self.get(path, success=(200, 204, 304, 404), )
         if r.status_code == 404:
-            r.release()
             raise ClientError("Incorrect account (%s) for that container"%self.account, r.status_code)
         elif r.status_code == 304:
-            r.release()
             return []
         reply = r.json
-        r.release()
         return reply
 
     def list_objects_in_path(self, path_prefix):
@@ -228,9 +203,7 @@ class StorageClient(Client):
         self.set_param('path', 'path_prefix')
         r = self.get(path, success=(200, 204, 404))
         if r.status_code == 404:
-            r.release()
             raise ClientError("Incorrect account (%s) for that container"%self.account, r.status_code)
         reply = r.json
-        r.release()
         return reply
 

diff --git a/kamaki/clients/tests.py b/kamaki/clients/tests.py
index 9ec0c69..84ff1eb 100644 (file)
--- a/kamaki/clients/tests.py
+++ b/kamaki/clients/tests.py
@@ -452,12 +452,10 @@ class testPithos(unittest.TestCase):
         r = self.client.container_head()
         self.assertEqual(r.status_code, 204)
         
-
         """Check until"""
         r = self.client.container_head(until=1000000, success=(204, 404))
         self.assertEqual(r.status_code, 404)
         
-
         """Check and if(un)modified_since"""
         for format in self.client.DATE_FORMATS:
             now_formated = self.now_unformated.strftime(format)
@@ -469,6 +467,10 @@ class testPithos(unittest.TestCase):
             r2.release()
             self.assertNotEqual(sc1, sc2)
 
+        """Check container object meta"""
+        r = self.client.get_container_object_meta()
+        self.assertEqual(r['x-container-object-meta'], 'Incontainer')
+
     def test_container_get(self):
         """Test container_GET"""
         self.client.container = self.c1