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/main.py | |
parent | 04d5d98e117e77c172d6bc3244c59d7e829051f4 (diff) | |
parent | 6023c50ca1a02808703ffb5a3cb18375a1c5a8fa (diff) |
Merge "support config file"
Diffstat (limited to 'tests/main.py')
-rw-r--r-- | tests/main.py | 10 |
1 files changed, 9 insertions, 1 deletions
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() |