From 32da2b46c5aaf6eea14a8f2d2962748ae9c8c1de Mon Sep 17 00:00:00 2001 From: Wu Wenxiang Date: Sat, 17 Aug 2013 00:20:38 +0800 Subject: [PATCH] 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 --- tests/test_auth_token_middleware.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/test_auth_token_middleware.py b/tests/test_auth_token_middleware.py index a9b5e6953..643b40394 100644 --- a/tests/test_auth_token_middleware.py +++ b/tests/test_auth_token_middleware.py @@ -938,7 +938,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): 'memcached_servers': ['localhost:11211'], 'memcache_security_strategy': 'Encrypt' } - self.assertRaises(Exception, self.set_middleware, conf) + self.assertRaises(Exception, self.set_middleware, conf=conf) # test invalue memcache_security_strategy conf = { 'auth_host': 'keystone.example.com', @@ -947,7 +947,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): 'memcached_servers': ['localhost:11211'], 'memcache_security_strategy': 'whatever' } - self.assertRaises(Exception, self.set_middleware, conf) + self.assertRaises(Exception, self.set_middleware, conf=conf) # test missing memcache_secret_key conf = { 'auth_host': 'keystone.example.com', @@ -956,7 +956,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): 'memcached_servers': ['localhost:11211'], 'memcache_security_strategy': 'mac' } - self.assertRaises(Exception, self.set_middleware, conf) + self.assertRaises(Exception, self.set_middleware, conf=conf) conf = { 'auth_host': 'keystone.example.com', 'auth_port': 1234, @@ -965,7 +965,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): 'memcache_security_strategy': 'Encrypt', 'memcache_secret_key': '' } - self.assertRaises(Exception, self.set_middleware, conf) + self.assertRaises(Exception, self.set_middleware, conf=conf) conf = { 'auth_host': 'keystone.example.com', 'auth_port': 1234, @@ -974,7 +974,7 @@ class AuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest): 'memcache_security_strategy': 'mAc', '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): conf = {