openstack
/
swift
Code Issues Proposed changes

Merge "func tests: tolerate more 404s when deleting"

This commit is contained in:
Zuul 2019-07-13 01:03:59 +00:00 committed by Gerrit Code Review
parent cf18e1f47b b10f4bae28
commit 4643412bd1
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/functional/test_dlo.py
View File

@ -136,7 +136,7 @@ class TestDlo(Base):
man1_item.copy(self.env.container.name, "copied-man1") man1_item.copy(self.env.container.name, "copied-man1")
finally: finally:
# try not to leave this around for other tests to stumble over # try not to leave this around for other tests to stumble over
f_segment.delete() f_segment.delete(tolerate_missing=True)
file_item = self.env.container.file('copied-man1') file_item = self.env.container.file('copied-man1')
file_contents = file_item.read() file_contents = file_item.read()
@ -162,7 +162,7 @@ class TestDlo(Base):
"copied-man1") "copied-man1")
finally: finally:
# try not to leave this around for other tests to stumble over # try not to leave this around for other tests to stumble over
f_segment.delete() f_segment.delete(tolerate_missing=True)
file_item = self.env.container.file('copied-man1') file_item = self.env.container.file('copied-man1')
file_contents = file_item.read() file_contents = file_item.read()
@ -192,7 +192,8 @@ class TestDlo(Base):
copied.info()['x_object_manifest']) copied.info()['x_object_manifest'])
finally: finally:
# try not to leave this around for other tests to stumble over # try not to leave this around for other tests to stumble over
self.env.container.file("copied-man1").delete() self.env.container.file("copied-man1").delete(
tolerate_missing=True)
def test_dlo_if_match_get(self): def test_dlo_if_match_get(self):
manifest = self.env.container.file("man1") manifest = self.env.container.file("man1")