summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2012-09-12 10:28:18 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2012-09-19 11:00:55 +0800
commit4f39aa2b94efaed08f43ef8a01067f89e2d2b192 (patch)
tree5f30a278cc8cd48e18c106514309740447059640 /tests
parentf261f718eebdfc60cdf9ce1f227c43f462dc163c (diff)
downloadkeystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.tar.gz
keystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.tar.xz
keystone-4f39aa2b94efaed08f43ef8a01067f89e2d2b192.zip
Backslash continuation cleanup
Removed unnecessary backslash continuations Added backslash continuation rules to HACKING.rst Change-Id: Id91da5b7e9be4d4587dded95fe7a0415240213ec
Diffstat (limited to 'tests')
-rw-r--r--tests/test_auth_token_middleware.py9
-rw-r--r--tests/test_backend_pam.py4
-rw-r--r--tests/test_keystoneclient.py12
-rw-r--r--tests/test_s3_token_middleware.py6
4 files changed, 16 insertions, 15 deletions
diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py
index bc64b050..01b4070f 100644
--- a/tests/test_auth_token_middleware.py
+++ b/tests/test_auth_token_middleware.py
@@ -317,13 +317,14 @@ class BaseAuthTokenMiddlewareTest(test.TestCase):
self.response_status = None
self.response_headers = None
self.middleware.revoked_file_name = tempfile.mkstemp()[1]
- self.middleware.token_revocation_list_cache_timeout =\
- datetime.timedelta(days=1)
+ cache_timeout = datetime.timedelta(days=1)
+ self.middleware.token_revocation_list_cache_timeout = cache_timeout
self.middleware.token_revocation_list = jsonutils.dumps(
{"revoked": [], "extra": "success"})
- globals()['SIGNED_REVOCATION_LIST'] =\
- globals()['VALID_SIGNED_REVOCATION_LIST']
+ signed_list = 'SIGNED_REVOCATION_LIST'
+ valid_signed_list = 'VALID_SIGNED_REVOCATION_LIST'
+ globals()[signed_list] = globals()[valid_signed_list]
super(BaseAuthTokenMiddlewareTest, self).setUp()
diff --git a/tests/test_backend_pam.py b/tests/test_backend_pam.py
index 5fad3ea7..d5af5f24 100644
--- a/tests/test_backend_pam.py
+++ b/tests/test_backend_pam.py
@@ -40,8 +40,8 @@ class PamIdentity(test.TestCase):
self.assertDictEqual(self.tenant_in, tenant_out)
def test_get_tenant_by_name(self):
- tenant_out = self.identity_api.\
- get_tenant_by_name(self.tenant_in['name'])
+ tenant_in_name = self.tenant_in['name']
+ tenant_out = self.identity_api.get_tenant_by_name(tenant_in_name)
self.assertDictEqual(self.tenant_in, tenant_out)
def test_get_user(self):
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index f42c3e70..f2cd98b6 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -924,8 +924,8 @@ class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
'/v2.0/OS-KSCRUD/users/%s' % self.user_two['id'],
headers={'X-Auth-Token': token_id})
req.method = 'PATCH'
- req.body = '{"user":{"password":"%s","original_password":"%s"}}' % \
- (new_password, self.user_two['password'])
+ req.body = ('{"user":{"password":"%s","original_password":"%s"}}' %
+ (new_password, self.user_two['password']))
self.public_server.application(req.environ,
responseobject.start_fake_response)
@@ -951,8 +951,8 @@ class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
'/v2.0/OS-KSCRUD/users/%s' % self.user_foo['id'],
headers={'X-Auth-Token': token_id})
req.method = 'PATCH'
- req.body = '{"user":{"password":"%s","original_password":"%s"}}' % \
- (new_password, self.user_two['password'])
+ req.body = ('{"user":{"password":"%s","original_password":"%s"}}' %
+ (new_password, self.user_two['password']))
self.public_server.application(req.environ,
responseobject.start_fake_response)
self.assertEquals(403, responseobject.response_status)
@@ -980,8 +980,8 @@ class KcMasterTestCase(CompatTestCase, KeystoneClientTests):
'/v2.0/OS-KSCRUD/users/%s' % self.user_two['id'],
headers={'X-Auth-Token': token_id})
req.method = 'PATCH'
- req.body = '{"user":{"password":"%s","original_password":"%s"}}' % \
- (new_password, self.user_two['password'])
+ req.body = ('{"user":{"password":"%s","original_password":"%s"}}' %
+ (new_password, self.user_two['password']))
rv = self.public_server.application(
req.environ,
diff --git a/tests/test_s3_token_middleware.py b/tests/test_s3_token_middleware.py
index 745e5d4f..08d8c08a 100644
--- a/tests/test_s3_token_middleware.py
+++ b/tests/test_s3_token_middleware.py
@@ -31,9 +31,9 @@ def denied_request(code):
'AccessDenied': (401, 'Access denied'),
'InvalidURI': (400, 'Could not parse the specified URI'),
}
- xml = '<?xml version="1.0" encoding="UTF-8"?>\r\n<Error>\r\n ' \
- '<Code>%s</Code>\r\n <Message>%s</Message>\r\n</Error>\r\n' \
- % (code, error_table[code][1])
+ xml = ('<?xml version="1.0" encoding="UTF-8"?>\r\n<Error>\r\n '
+ '<Code>%s</Code>\r\n <Message>%s</Message>\r\n</Error>\r\n' %
+ (code, error_table[code][1]))
return xml