openstack/swift
Code Issues Proposed changes

Merge "Tolerate missing containers when trying to clean up"

Browse Source
This commit is contained in:
Zuul 2018-10-08 07:16:35 +00:00 committed by Gerrit Code Review
commit a4376a43de
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/functional/swift_test_client.py
View File

@ -492,7 +492,8 @@ class Account(Base):
def delete_containers(self): def delete_containers(self):
for c in listing_items(self.containers): for c in listing_items(self.containers):
cont = self.container(c) cont = self.container(c)
cont.update_metadata(hdrs={'x-versions-location': ''}) cont.update_metadata(hdrs={'x-versions-location': ''},
tolerate_missing=True)
if not cont.delete_recursive(): if not cont.delete_recursive():
return False return False
@ -546,17 +547,19 @@ class Container(Base):
return self.conn.make_request('PUT', self.path, hdrs=hdrs, return self.conn.make_request('PUT', self.path, hdrs=hdrs,
parms=parms, cfg=cfg) in (201, 202) parms=parms, cfg=cfg) in (201, 202)
def update_metadata(self, hdrs=None, cfg=None): def update_metadata(self, hdrs=None, cfg=None, tolerate_missing=False):
if hdrs is None: if hdrs is None:
hdrs = {} hdrs = {}
if cfg is None: if cfg is None:
cfg = {} cfg = {}
self.conn.make_request('POST', self.path, hdrs=hdrs, cfg=cfg) self.conn.make_request('POST', self.path, hdrs=hdrs, cfg=cfg)
if not 200 <= self.conn.response.status <= 299: if 200 <= self.conn.response.status <= 299:
return True
if tolerate_missing and self.conn.response.status == 404:
return True
raise ResponseError(self.conn.response, 'POST', raise ResponseError(self.conn.response, 'POST',
self.conn.make_path(self.path)) self.conn.make_path(self.path))
return True
def delete(self, hdrs=None, parms=None): def delete(self, hdrs=None, parms=None):
if hdrs is None: if hdrs is None: