openstack/swift
Code Issues Proposed changes

Merge "Fix failing cross-policy-versioning functional test"

Browse Source
This commit is contained in:
Jenkins 2016-10-05 22:57:18 +00:00 committed by Gerrit Code Review
commit ea84689598
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/tests.py
View File

@ -3998,6 +3998,7 @@ class TestCrossPolicyObjectVersioningEnv(object):
versioning_enabled = None versioning_enabled = None
multiple_policies_enabled = None multiple_policies_enabled = None
policies = None policies = None
location_header_key = 'X-Versions-Location'
@classmethod @classmethod
def setUp(cls): def setUp(cls):
@ -4045,7 +4046,7 @@ class TestCrossPolicyObjectVersioningEnv(object):
cls.container = cls.account.container(prefix + "-objs") cls.container = cls.account.container(prefix + "-objs")
if not cls.container.create( if not cls.container.create(
hdrs={'X-Versions-Location': cls.versions_container.name, hdrs={cls.location_header_key: cls.versions_container.name,
'X-Storage-Policy': version_policy['name']}): 'X-Storage-Policy': version_policy['name']}):
if cls.conn.response.status == 412: if cls.conn.response.status == 412:
cls.versioning_enabled = False cls.versioning_enabled = False