diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/config.py | 6 | ||||
| -rw-r--r-- | tests/main.py | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/tests/config.py b/tests/config.py index 7a0bef2d..3cacd0a2 100644 --- a/tests/config.py +++ b/tests/config.py @@ -7,6 +7,7 @@ # http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
import itertools
+
from oslo_config import cfg
import image
@@ -23,7 +24,7 @@ def list_opts(): ]
-def prepare_conf(conf=None):
+def prepare_conf(args=None, conf=None, config_files=None):
if conf is None:
conf = cfg.ConfigOpts()
@@ -31,4 +32,7 @@ def prepare_conf(conf=None): conf.register_opts(list(options),
group=None if group == 'DEFAULT' else group)
+ conf(args, project='doctor', validate_default_values=True,
+ default_config_files=config_files)
+
return conf
diff --git a/tests/main.py b/tests/main.py index 46f0c894..bb2c912d 100644 --- a/tests/main.py +++ b/tests/main.py @@ -6,6 +6,8 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +import os +from os.path import isfile, join import sys import config @@ -58,7 +60,13 @@ class DoctorTest(object): def main(): """doctor main""" - conf = config.prepare_conf() + doctor_root_dir = os.path.dirname(os.getcwd()) + config_file_dir = '{0}/{1}'.format(doctor_root_dir, 'etc/') + config_files = [join(config_file_dir, f) for f in os.listdir(config_file_dir) + if isfile(join(config_file_dir, f))] + + conf = config.prepare_conf(args=sys.argv[1:], + config_files=config_files) doctor = DoctorTest(conf) doctor.run() |