add a test for delete cas; fix kv.delete to return true or false depending on success

cablehead · cablehead · commit e7cfaf0b65a1 · 2015-04-22T21:23:18.000-07:00
diff --git a/consul/base.py b/consul/base.py
@@ -403,7 +403,7 @@ def delete(self, key, recurse=None, cas=None, token=None, dc=None):
             def callback(response):
                 if response.code == 403:
                     raise ACLPermissionDenied(response.body)
-                return response.code == 200
+                return json.loads(response.body)
 
             return self.agent.http.delete(
                 callback, '/v1/kv/%s' % key, params=params)
diff --git a/tests/test_std.py b/tests/test_std.py
@@ -108,6 +108,19 @@ def test_kv_delete(self, consul_port):
         index, data = c.kv.get('foo', recurse=True)
         assert data is None
 
+    def test_kv_delete_cas(self, consul_port):
+        c = consul.Consul(port=consul_port)
+
+        c.kv.put('foo', 'bar')
+        index, data = c.kv.get('foo')
+
+        assert c.kv.delete('foo', cas=data['ModifyIndex']-1) is False
+        assert c.kv.get('foo') == (index, data)
+
+        assert c.kv.delete('foo', cas=data['ModifyIndex']) is True
+        index, data = c.kv.get('foo')
+        assert data is None
+
     def test_kv_acquire_release(self, consul_port):
         c = consul.Consul(port=consul_port)
 
