Skip to content

Commit 057658b

Browse files
committed
Fixes #96
1 parent f977331 commit 057658b

File tree

2 files changed

+3
-39
lines changed

2 files changed

+3
-39
lines changed

kinto_http/__init__.py

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -254,11 +254,7 @@ def delete_bucket(self, bucket=None, safe=True, if_match=None, if_exists=False):
254254
resp, _ = self.session.request('delete', endpoint, headers=headers)
255255
return resp['data']
256256

257-
def delete_buckets(self, safe=True, if_match=None, if_exists=False):
258-
if if_exists:
259-
return self._delete_if_exists('buckets',
260-
safe=safe,
261-
if_match=if_match)
257+
def delete_buckets(self, safe=True, if_match=None):
262258
endpoint = self.get_endpoint('buckets')
263259
headers = self._get_cache_headers(safe, if_match=if_match)
264260
resp, _ = self.session.request('delete', endpoint, headers=headers)
@@ -415,12 +411,7 @@ def delete_collection(self, collection=None, bucket=None,
415411
resp, _ = self.session.request('delete', endpoint, headers=headers)
416412
return resp['data']
417413

418-
def delete_collections(self, bucket=None, safe=True, if_match=None, if_exists=False):
419-
if if_exists:
420-
return self._delete_if_exists('collections',
421-
bucket=bucket,
422-
safe=safe,
423-
if_match=if_match)
414+
def delete_collections(self, bucket=None, safe=True, if_match=None):
424415
endpoint = self.get_endpoint('collections', bucket=bucket)
425416
headers = self._get_cache_headers(safe, if_match=if_match)
426417
resp, _ = self.session.request('delete', endpoint, headers=headers)
@@ -523,13 +514,7 @@ def delete_record(self, id, collection=None, bucket=None,
523514
return resp['data']
524515

525516
def delete_records(self, collection=None, bucket=None,
526-
safe=True, if_match=None, if_exists=False):
527-
if if_exists:
528-
return self._delete_if_exists('records',
529-
collection=collection,
530-
bucket=bucket,
531-
safe=safe,
532-
if_match=if_match)
517+
safe=True, if_match=None):
533518
endpoint = self.get_endpoint('records',
534519
bucket=bucket,
535520
collection=collection)

kinto_http/tests/functional.py

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,6 @@ def test_buckets_deletion(self):
9494
assert buckets[0]['id'] == 'mozilla'
9595
self.assertRaises(BucketNotFound, self.client.get_bucket, 'mozilla')
9696

97-
def test_buckets_deletion_if_exists(self):
98-
self.client.create_bucket('mozilla')
99-
self.client.delete_buckets()
100-
self.client.delete_buckets(if_exists=True)
101-
10297
def test_bucket_save(self):
10398
self.client.create_bucket('mozilla', permissions={'write': ['alexis']})
10499
bucket = self.client.get_bucket('mozilla')
@@ -235,13 +230,6 @@ def test_collections_deletion(self):
235230
self.client.delete_collections(bucket='mozilla')
236231
assert len(self.client.get_collections(bucket='mozilla')) == 0
237232

238-
def test_collections_deletion_if_exists(self):
239-
self.client.create_bucket('mozilla')
240-
self.client.create_collection('amo', bucket='mozilla')
241-
self.client.create_collection('blocklist', bucket='mozilla')
242-
self.client.delete_collections(bucket='mozilla')
243-
self.client.delete_collections(bucket='mozilla', if_exists=True)
244-
245233
def test_record_creation_and_retrieval(self):
246234
client = Client(server_url=self.server_url, auth=self.auth,
247235
bucket='mozilla', collection='payments')
@@ -356,15 +344,6 @@ def test_multiple_record_deletion(self):
356344
client.delete_records()
357345
assert len(client.get_records()) == 0
358346

359-
def test_records_deletion_if_exists(self):
360-
client = Client(server_url=self.server_url, auth=self.auth,
361-
bucket='mozilla', collection='payments')
362-
client.create_bucket()
363-
client.create_collection()
364-
client.create_record({'foo': 'bar'})
365-
client.delete_records()
366-
client.delete_records(if_exists=True)
367-
368347
def test_bucket_sharing(self):
369348
alice_credentials = ('alice', 'p4ssw0rd')
370349
alice_userid = self.get_user_id(alice_credentials)

0 commit comments

Comments
 (0)