diff options
| author |   wenjuan dong <dong.wenjuan@zte.com.cn> | 2017-07-05 14:29:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-07-05 14:29:27 +0000 |
| commit | 2e35513b691b0319b96182c5d9c39e4ab1a97552 (patch) | |
| tree | 4e2cd3decb6ab82f4062e5061b8d8800868db92a /tests/config.py | |
| parent | 04d5d98e117e77c172d6bc3244c59d7e829051f4 (diff) | |
| parent | 6023c50ca1a02808703ffb5a3cb18375a1c5a8fa (diff) | |
Merge "support config file"
Diffstat (limited to 'tests/config.py')
| -rw-r--r-- | tests/config.py | 6 |
1 files changed, 5 insertions, 1 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
|