From 6ff877248404bd683e41faff440b6a6c1065e5ff Mon Sep 17 00:00:00 2001
From: Stavros Sachtouris <saxtouri@admin.grnet.gr>
Date: Wed, 25 Jul 2012 17:00:13 +0300
Subject: [PATCH] Added test_object_delete

---
 kamaki/clients/pithos.py |    2 +-
 kamaki/clients/tests.py  |   29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/kamaki/clients/pithos.py b/kamaki/clients/pithos.py
index 7eec919..80c67b7 100644
--- a/kamaki/clients/pithos.py
+++ b/kamaki/clients/pithos.py
@@ -566,7 +566,7 @@ class PithosClient(StorageClient):
         path = path4url(self.account, self.container, object)
         path += '' if until is None else params4url(dict(until=until))
         success = kwargs.pop('success', 204)
-        self.delete(path, *args, success=success, **kwargs)
+        return self.delete(path, *args, success=success, **kwargs)
 
     def purge_container(self):
         self.container_delete(until=unicode(time()))
diff --git a/kamaki/clients/tests.py b/kamaki/clients/tests.py
index 2932e69..f42c043 100644
--- a/kamaki/clients/tests.py
+++ b/kamaki/clients/tests.py
@@ -699,7 +699,7 @@ class testPithos(unittest.TestCase):
         self.client.delete_object(obj+'2')
         self.client.container=''
 
-    def test_object_post(self):
+    def atest_object_post(self):
         self.client.container='testCo0'
         obj = 'obj'+unicode(self.now)
         """create a filesystem file"""
@@ -814,6 +814,30 @@ class testPithos(unittest.TestCase):
         os.remove(obj)
         self.client.container=''
 
+    def test_object_delete(self):
+        self.client.container='testCo0'
+        obj = 'obj'+unicode(self.now)
+        """create a file on container"""
+        r = self.client.object_put(obj, content_type='application/octet-stream',
+            data= 'H', metadata={'mkey1':'mval1', 'mkey2':'mval2'},
+            permitions={'read':['accX:groupA', 'u1', 'u2'], 'write':['u2', 'u3']})
+        self.client.reset_headers()
+
+        """Check with false until"""
+        r = self.client.object_delete(obj, until=1000000)
+        self.client.reset_headers()
+        r = self.client.object_get(obj, success=(200, 404))
+        self.assertEqual(r.status_code, 200)
+
+        """Check normal case"""
+        r = self.client.object_delete(obj)
+        self.client.reset_headers()
+        self.assertEqual(r.status_code, 204)
+        r = self.client.object_get(obj, success=(200, 404))
+        self.assertEqual(r.status_code, 404)
+
+        self.client.container = ''
+
 class testCyclades(unittest.TestCase):
     def setUp(self):
         pass
@@ -844,7 +868,8 @@ if __name__ == '__main__':
     #suiteFew.addTest(testPithos('test_object_put'))
     #suiteFew.addTest(testPithos('test_object_copy'))
     #suiteFew.addTest(testPithos('test_object_move'))
-    suiteFew.addTest(testPithos('test_object_post'))
+    #suiteFew.addTest(testPithos('test_object_post'))
+    suiteFew.addTest(testPithos('test_object_delete'))
 
     #kamaki/cyclades.py
     #suiteFew.addTest(testCyclades('test_list_servers'))
-- 
1.7.10.4