summaryrefslogtreecommitdiff
path: root/tests/unit/test_shell.py
diff options
context:
space:
mode:
Diffstat (limited to 'tests/unit/test_shell.py')
-rw-r--r--tests/unit/test_shell.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/unit/test_shell.py b/tests/unit/test_shell.py
index 9ef4685..f5d2f15 100644
--- a/tests/unit/test_shell.py
+++ b/tests/unit/test_shell.py
@@ -1996,8 +1996,8 @@ class TestBase(unittest.TestCase):
self._environ_vars = {}
keys = list(os.environ.keys())
for k in keys:
- if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH')
- or k.startswith('OS_')):
+ if (k in ('ST_KEY', 'ST_USER', 'ST_AUTH') or
+ k.startswith('OS_')):
self._environ_vars[k] = os.environ.pop(k)
def _replace_swift_env_vars(self):
@@ -2979,12 +2979,12 @@ class TestCrossAccountObjectAccess(TestBase, MockHttpTest):
Modify response code to 200 if cross account permissions match.
"""
status = 403
- if (path.startswith('/v1/%s/%s' % (self.account, self.cont))
- and read_ok and method in ('GET', 'HEAD')):
+ if (path.startswith('/v1/%s/%s' % (self.account, self.cont)) and
+ read_ok and method in ('GET', 'HEAD')):
status = 200
elif (path.startswith('/v1/%s/%s%s'
- % (self.account, self.cont, self.obj))
- and write_ok and method in ('PUT', 'POST', 'DELETE')):
+ % (self.account, self.cont, self.obj)) and
+ write_ok and method in ('PUT', 'POST', 'DELETE')):
status = 200
return status
return on_request