openstack/swift
Code Issues Proposed changes

Merge "Fix flakey symlink setup/teardown"

Browse Source
This commit is contained in:
Zuul
2019-02-05 19:41:06 +00:00
committed by Gerrit Code Review
parent 00f0d9d008 f319c412ac
commit f59ee15374
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/functional/test_symlink.py
View File

@@ -23,6 +23,7 @@ import time
from six.moves import urllib from six.moves import urllib
from uuid import uuid4 from uuid import uuid4
from swift.common.http import is_success
from swift.common.utils import json, MD5_OF_EMPTY_STRING from swift.common.utils import json, MD5_OF_EMPTY_STRING
from swift.common.middleware.slo import SloGetContext from swift.common.middleware.slo import SloGetContext
from test.functional import check_response, retry, requires_acls, \ from test.functional import check_response, retry, requires_acls, \
@@ -94,7 +95,7 @@ class TestSymlinkEnv(BaseEnv):
headers = headers or {} headers = headers or {}
resp = retry(cls._make_request, method='PUT', container=name, resp = retry(cls._make_request, method='PUT', container=name,
headers=headers, use_account=use_account) headers=headers, use_account=use_account)
if resp.status != 201: if resp.status not in (201, 202):
raise ResponseError(resp) raise ResponseError(resp)
return name return name
@@ -132,7 +133,7 @@ class TestSymlinkEnv(BaseEnv):
use_account=use_account) use_account=use_account)
if resp.status == 404: if resp.status == 404:
break break
if resp.status // 100 != 2: if not is_success(resp.status):
raise ResponseError(resp) raise ResponseError(resp)
objs = json.loads(resp.content) objs = json.loads(resp.content)
if not objs: if not objs:
@@ -141,7 +142,7 @@ class TestSymlinkEnv(BaseEnv):
resp = retry(cls._make_request, method='DELETE', resp = retry(cls._make_request, method='DELETE',
container=container, obj=obj['name'], container=container, obj=obj['name'],
use_account=use_account) use_account=use_account)
if (resp.status != 204): if resp.status not in (204, 404):
raise ResponseError(resp) raise ResponseError(resp)
# delete the containers # delete the containers