Merge "Correct keyword args in test cases"

This commit is contained in:
Jenkins
2013-08-31 11:23:31 +00:00
committed by Gerrit Code Review

View File

@@ -738,31 +738,31 @@ class CommonAuthTokenMiddlewareTest(object):
'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 = {
'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 = {
'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 = {
'memcached_servers': ['localhost:11211'], 'memcached_servers': ['localhost:11211'],
'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 = {
'memcached_servers': ['localhost:11211'], 'memcached_servers': ['localhost:11211'],
'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 = {