diff options
| -rwxr-xr-x | testcases/features/doctor.py | 11 | ||||
| -rwxr-xr-x | testcases/features/promise.py | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py index 95531596..badcfe60 100755 --- a/testcases/features/doctor.py +++ b/testcases/features/doctor.py @@ -14,6 +14,7 @@ # # import argparse +import os import time import functest.utils.functest_logger as ft_logger @@ -28,8 +29,8 @@ args = parser.parse_args() functest_yaml = functest_utils.get_functest_yaml() -dirs = functest_yaml.get('general').get('directories') -DOCTOR_REPO = dirs.get('dir_repo_doctor') +DOCTOR_REPO = functest_utils.get_parameter_from_yaml( + 'general.directories.dir_repo_doctor') RESULTS_DIR = functest_utils.get_parameter_from_yaml( 'general.directories.dir_results') @@ -38,6 +39,12 @@ logger = ft_logger.Logger("doctor").getLogger() def main(): exit_code = -1 + + # if the image name is explicitly set for the doctor suite, set it as + # enviroment variable + if 'doctor' in functest_yaml and 'image_name' in functest_yaml['doctor']: + os.environ["IMAGE_NAME"] = functest_yaml['doctor']['image_name'] + cmd = 'cd %s/tests && ./run.sh' % DOCTOR_REPO log_file = RESULTS_DIR + "/doctor.log" diff --git a/testcases/features/promise.py b/testcases/features/promise.py index a7899fec..5b23614d 100755 --- a/testcases/features/promise.py +++ b/testcases/features/promise.py @@ -182,8 +182,8 @@ def main(): os.environ["OS_TEST_NETWORK"] = network_dic["net_id"] os.chdir(PROMISE_REPO) - results_file_name = 'promise-results.json' - results_file = open(RESULTS_DIR + '/' + results_file_name, 'w+') + results_file_name = RESULTS_DIR + '/' + 'promise-results.json' + results_file = open(results_file_name, 'w+') cmd = 'npm run -s test -- --reporter json' logger.info("Running command: %s" % cmd) |