openstack/swift
Code Issues Proposed changes

Merge "Tolerate 404s during setUp/tearDown in func tests"

Browse Source
This commit is contained in:
Zuul 2018-03-06 04:09:19 +00:00 committed by Gerrit Code Review
commit 9a62261eb6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/functional/swift_test_client.py
View File

@ -543,7 +543,7 @@ class Container(Base):
def delete_files(self):
for f in listing_items(self.files):
file_item = self.file(f)
if not file_item.delete():
if not file_item.delete(tolerate_missing=True):
return False
return listing_empty(self.files)
@ -764,14 +764,19 @@ class File(Base):
self.conn.make_path(self.path))
return True
def delete(self, hdrs=None, parms=None, cfg=None):
def delete(self, hdrs=None, parms=None, cfg=None, tolerate_missing=False):
if hdrs is None:
hdrs = {}
if parms is None:
parms = {}
if self.conn.make_request('DELETE', self.path, hdrs=hdrs,
cfg=cfg, parms=parms) != 204:
if tolerate_missing:
allowed_statuses = (204, 404)
else:
allowed_statuses = (204,)
if self.conn.make_request(
'DELETE', self.path, hdrs=hdrs, cfg=cfg,
parms=parms) not in allowed_statuses:
raise ResponseError(self.conn.response, 'DELETE',
self.conn.make_path(self.path))