summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortermie <github@anarkystic.com>2012-02-01 14:50:02 -0800
committertermie <github@anarkystic.com>2012-02-01 15:41:16 -0800
commit09bd758fb88387cf9e58666b1bbcded4e019037e (patch)
tree390046e5ad2f4ef43ad01812d6589e6b2a034c63
parent37e1c5c57a140c41b154ba9901855026e4ee5c3b (diff)
downloadkeystone-09bd758fb88387cf9e58666b1bbcded4e019037e.tar.gz
keystone-09bd758fb88387cf9e58666b1bbcded4e019037e.tar.xz
keystone-09bd758fb88387cf9e58666b1bbcded4e019037e.zip
deal with reparsing the config files
-rw-r--r--tests/test_cli.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 82fde86d..e66d6f63 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -15,8 +15,15 @@ KEYSTONECLIENT_REPO = 'git://github.com/openstack/python-keystoneclient.git'
class CliMasterTestCase(test_keystoneclient.KcMasterTestCase):
def setUp(self):
super(CliMasterTestCase, self).setUp()
+ # NOTE(termie): we need to reset and reparse the config here because
+ # cli adds new command-line config options
+ # NOTE(termie): we are importing cli here because it imports
+ # keystoneclient, which we are loading from different
+ # sources between tests
+ CONF.reset()
from keystone import cli
self.cli = cli
+ self.config()
def get_client(self, user_ref=None, tenant_ref=None):
if user_ref is None: