openstack/swift
Code Issues Proposed changes

Merge "Skip test when object versioning is not enabled"

Browse Source
This commit is contained in:
Zuul 2019-09-19 00:23:49 +00:00 committed by Gerrit Code Review
commit dd1eacb7c5
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/functional/test_versioned_writes.py
View File

@ -982,7 +982,10 @@ class TestSloWithVersioning(unittest2.TestCase):
self.segments_container = self.account.container(Utils.create_name()) self.segments_container = self.account.container(Utils.create_name())
if not self.container.create( if not self.container.create(
hdrs={'X-Versions-Location': self.versions_container.name}): hdrs={'X-Versions-Location': self.versions_container.name}):
raise ResponseError(self.conn.response) if self.conn.response.status == 412:
raise SkipTest("Object versioning not enabled")
else:
raise ResponseError(self.conn.response)
if 'versions' not in self.container.info(): if 'versions' not in self.container.info():
raise SkipTest("Object versioning not enabled") raise SkipTest("Object versioning not enabled")