Correct keyword args in test cases

In tests/test_auth_token_middleware.py, some assertRaises tests do not
pass conf as a keyword argument to self.set_middleware. This patch
correct them.

Fixes bug #1212984

Change-Id: Idd34dc043526a4eb22b28b144d327fd95aa14af2
This commit is contained in:
Wu Wenxiang
2013-08-17 00:20:38 +08:00
parent bbcc7a7769
commit 32da2b46c5

View File

@@ -938,7 +938,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
'memcached_servers': ['localhost:11211'], 'memcached_servers': ['localhost:11211'],
'memcache_security_strategy': 'Encrypt' 'memcache_security_strategy': 'Encrypt'
} }
self.assertRaises(Exception, self.set_middleware, conf) self.assertRaises(Exception, self.set_middleware, conf=conf)
# test invalue memcache_security_strategy # test invalue memcache_security_strategy
conf = { conf = {
'auth_host': 'keystone.example.com', 'auth_host': 'keystone.example.com',
@@ -947,7 +947,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
'memcached_servers': ['localhost:11211'], 'memcached_servers': ['localhost:11211'],
'memcache_security_strategy': 'whatever' 'memcache_security_strategy': 'whatever'
} }
self.assertRaises(Exception, self.set_middleware, conf) self.assertRaises(Exception, self.set_middleware, conf=conf)
# test missing memcache_secret_key # test missing memcache_secret_key
conf = { conf = {
'auth_host': 'keystone.example.com', 'auth_host': 'keystone.example.com',
@@ -956,7 +956,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
'memcached_servers': ['localhost:11211'], 'memcached_servers': ['localhost:11211'],
'memcache_security_strategy': 'mac' 'memcache_security_strategy': 'mac'
} }
self.assertRaises(Exception, self.set_middleware, conf) self.assertRaises(Exception, self.set_middleware, conf=conf)
conf = { conf = {
'auth_host': 'keystone.example.com', 'auth_host': 'keystone.example.com',
'auth_port': 1234, 'auth_port': 1234,
@@ -965,7 +965,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
'memcache_security_strategy': 'Encrypt', 'memcache_security_strategy': 'Encrypt',
'memcache_secret_key': '' 'memcache_secret_key': ''
} }
self.assertRaises(Exception, self.set_middleware, conf) self.assertRaises(Exception, self.set_middleware, conf=conf)
conf = { conf = {
'auth_host': 'keystone.example.com', 'auth_host': 'keystone.example.com',
'auth_port': 1234, 'auth_port': 1234,
@@ -974,7 +974,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest):
'memcache_security_strategy': 'mAc', 'memcache_security_strategy': 'mAc',
'memcache_secret_key': '' 'memcache_secret_key': ''
} }
self.assertRaises(Exception, self.set_middleware, conf) self.assertRaises(Exception, self.set_middleware, conf=conf)
def test_config_revocation_cache_timeout(self): def test_config_revocation_cache_timeout(self):
conf = { conf = {