1 files changed, 25 insertions, 3 deletions
diff --git a/tests/config.py b/tests/config.py
index 2288d36e..f33ab5d2 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -6,20 +6,39 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+import itertools
+
 from oslo_config import cfg
 
+import alarm
+import consumer
 import image
+import instance
+import installer
+import network
+import inspector
+import monitor
 import os_clients
+import user
 
 
 def list_opts():
     return [
-        ('os_clients', os_clients.OPTS),
-        ('image', image.IMAGE_OPTS),
+        ('installer', installer.OPTS),
+        ('monitor', monitor.OPTS),
+        ('inspector', inspector.OPTS),
+        ('consumer', consumer.OPTS),
+        ('DEFAULT', itertools.chain(
+            os_clients.OPTS,
+            image.OPTS,
+            user.OPTS,
+            network.OPTS,
+            instance.OPTS,
+            alarm.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 +46,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