From d2619f12cd099b557fb0035347b6b00823fd90c7 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Sun, 13 May 2012 18:21:18 +0100 Subject: [PATCH] Use cfg's new behavior of reset() clearing overrides Change-Id: I992a955529e57f20c2dc6db62b7305558848cf0c --- keystone/test.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/keystone/test.py b/keystone/test.py index 5b7d66e4c6..6c017158c4 100644 --- a/keystone/test.py +++ b/keystone/test.py @@ -146,29 +146,15 @@ class TestCase(unittest.TestCase): if path in sys.path: sys.path.remove(path) kvs.INMEMDB.clear() - self.reset_opts() + CONF.reset() def opt_in_group(self, group, **kw): for k, v in kw.iteritems(): CONF.set_override(k, v, group) - if group not in self._group_overrides: - self._group_overrides[group] = [] - self._group_overrides[group].append(k) def opt(self, **kw): for k, v in kw.iteritems(): CONF.set_override(k, v) - self._overrides.append(k) - - def reset_opts(self): - for group, opt_list in self._group_overrides.iteritems(): - for k in opt_list: - CONF.set_override(k, None, group) - for k in self._overrides: - CONF.set_override(k, None) - self._overrides = [] - self._group_overrides = {} - CONF.reset() def load_backends(self): """Hacky shortcut to load the backends for data manipulation."""