diff options
author | Leo wang <grakiss.wanglei@huawei.com> | 2017-09-29 03:34:16 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-09-29 03:34:16 +0000 |
commit | f0633486049e9e2d09001fd5c2a599a722f76d03 (patch) | |
tree | 1ed01c1399bfac712005decccde74f57be9da70f /dovetail/run.py | |
parent | 647e253b0093170ab378869cbd1392a43ffb2ebb (diff) | |
parent | 186cdc71bf9bdd00be1df87d90d1a4c57790208c (diff) |
Merge "Support to run mandatory or optional test cases separately"
Diffstat (limited to 'dovetail/run.py')
-rwxr-xr-x | dovetail/run.py | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/dovetail/run.py b/dovetail/run.py index 7de4c814..0306efe4 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -38,14 +38,10 @@ def load_testcase(): def run_test(testsuite, testarea, logger): - testarea_list = [] - for value in testsuite['testcases_list']: - if value is not None and (testarea == 'full' or testarea in value): - testarea_list.append(value) - + testcase_list = Testcase.get_testcase_list(testsuite, testarea) duration = 0 start_time = time.time() - for testcase_name in testarea_list: + for testcase_name in testcase_list: logger.info('>>[testcase]: {}'.format(testcase_name)) testcase = Testcase.get(testcase_name) if testcase is None: @@ -284,14 +280,11 @@ def main(*args, **kwargs): else: dt_cfg.dovetail_config['offline'] = False - testarea = kwargs['testarea'] + origin_testarea = kwargs['testarea'] testsuite_validation = False - testarea_validation = False - if (testarea == 'full') or \ - (testarea in dt_cfg.dovetail_config['testarea_supported']): - testarea_validation = True if kwargs['testsuite'] in dt_cfg.dovetail_config['testsuite_supported']: testsuite_validation = True + testarea_validation, testarea = Testcase.check_testarea(origin_testarea) if testsuite_validation and testarea_validation: testsuite_yaml = load_testsuite(kwargs['testsuite']) load_testcase() @@ -302,7 +295,7 @@ def main(*args, **kwargs): Report.save_logs() else: logger.error('Invalid input commands, testsuite {} testarea {}' - .format(kwargs['testsuite'], testarea)) + .format(kwargs['testsuite'], origin_testarea)) dt_cfg.load_config_files() |