commit 102e00831a28535764d323eee36043c80acf29cf
author Jenkins <jenkins@review.openstack.org> Tue Jan 12 23:04:24 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jan 12 23:04:24 2016 +0000
tree cc1b09c795100cb86c3aefb1bbae8ce3a544d3fd
parent 13fba5ac178e64b978f3c6f2dcf6698df2222977
parent 0ae551fdf57ecdd95963e683c9eccbb5dfdf43c4

Merge "Fix leak from tempest.conf in fake_config fixture"

tempest/tests/fake_config.py

diff --git a/tempest/tests/fake_config.py b/tempest/tests/fake_config.py
index ca8bc3e..c45f6da 100644
--- a/tempest/tests/fake_config.py
+++ b/tempest/tests/fake_config.py
@@ -24,6 +24,7 @@
 class ConfigFixture(conf_fixture.Config):
 
     def __init__(self):
+        cfg.CONF([], default_config_files=[])
         config.register_opts()
         super(ConfigFixture, self).__init__()
 
@@ -59,6 +60,5 @@
 
 class FakePrivate(config.TempestConfigPrivate):
     def __init__(self, parse_conf=True, config_path=None):
-        cfg.CONF([], default_config_files=[])
         self._set_attrs()
-        self.lock_path = cfg.CONF.lock_path
+        self.lock_path = cfg.CONF.oslo_concurrency.lock_path