X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tests%2Fconfig.py;h=3cacd0a29ae23fea3770c34a583239cbf301a23e;hb=6023c50ca1a02808703ffb5a3cb18375a1c5a8fa;hp=2288d36ef20625c94ad466172c880480a1edd61a;hpb=d5918a87f12fdef9bd7408c4554c42606c4896d8;p=doctor.git

diff --git a/tests/config.py b/tests/config.py
index 2288d36e..3cacd0a2 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -6,20 +6,25 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+import itertools
+
 from oslo_config import cfg
 
 import image
 import os_clients
+import user
 
 
 def list_opts():
     return [
-        ('os_clients', os_clients.OPTS),
-        ('image', image.IMAGE_OPTS),
+        ('DEFAULT', itertools.chain(
+            os_clients.OPTS,
+            image.OPTS,
+            user.OPTS))
     ]
 
 
-def prepare_conf(conf=None):
+def prepare_conf(args=None, conf=None, config_files=None):
     if conf is None:
         conf = cfg.ConfigOpts()
 
@@ -27,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