File 0001-Pass-memcache_servers-as-array.patch of Package python-keystoneclient
From 38d1bf24c1565a461d50e256bdf0b00f46b90f00 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 25 Apr 2013 16:11:19 +0200
Subject: [PATCH] Pass memcache_servers as array
the python-memcached module expects memcache_servers to be an
array of strings or an array of tuples. Since we don't care about
server weighting, we can use an array of tuples for the unit test.
Fixes bug 1172723
Change-Id: Iafba2bda545ea334d5aba7135e153d8589612ba4
---
tests/test_auth_token_middleware.py | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
Index: python-keystoneclient-0.2.3/tests/test_auth_token_middleware.py
===================================================================
--- python-keystoneclient-0.2.3.orig/tests/test_auth_token_middleware.py
+++ python-keystoneclient-0.2.3/tests/test_auth_token_middleware.py
@@ -983,7 +983,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211'
+ 'memcache_servers': ['localhost:11211']
}
self.set_middleware(conf=conf)
@@ -994,7 +994,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
'cache': 'swift.cache',
- 'memcache_servers': 'localhost:11211'
+ 'memcache_servers': ['localhost:11211']
}
self.set_middleware(conf=conf)
self.middleware._init_cache(env)
@@ -1006,7 +1006,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211'
+ 'memcache_servers': ['localhost:11211']
}
self.set_middleware(conf=conf)
self.middleware._init_cache(env)
@@ -1025,7 +1025,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'encrypt',
'memcache_secret_key': 'mysecret'
}
@@ -1048,7 +1048,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'mac',
'memcache_secret_key': 'mysecret'
}
@@ -1072,7 +1072,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_secret_key': 'mysecret'
}
self.set_middleware(conf=conf)
@@ -1088,7 +1088,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_secret_key': 'mysecret'
}
self.set_middleware(conf=conf)
@@ -1099,7 +1099,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'mac',
'memcache_secret_key': 'mysecret'
}
@@ -1110,7 +1110,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'Encrypt',
'memcache_secret_key': 'abc!'
}
@@ -1124,7 +1124,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'Encrypt'
}
self.assertRaises(Exception, self.set_middleware, conf)
@@ -1133,7 +1133,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'whatever'
}
self.assertRaises(Exception, self.set_middleware, conf)
@@ -1142,7 +1142,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'mac'
}
self.assertRaises(Exception, self.set_middleware, conf)
@@ -1150,7 +1150,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'Encrypt',
'memcache_secret_key': ''
}
@@ -1159,7 +1159,7 @@ class AuthTokenMiddlewareTest(test.NoMod
'auth_host': 'keystone.example.com',
'auth_port': 1234,
'auth_admin_prefix': '/testadmin',
- 'memcache_servers': 'localhost:11211',
+ 'memcache_servers': ['localhost:11211'],
'memcache_security_strategy': 'mAc',
'memcache_secret_key': ''
}
