diff options
| -rw-r--r-- | dovetail/report.py | 20 | ||||
| -rwxr-xr-x | dovetail/run.py | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/dovetail/report.py b/dovetail/report.py index c51ce687..2c6200d3 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -416,16 +416,20 @@ class FunctestChecker(object): testcase_passed = 'SKIP' for sub_testcase in sub_testcase_list: self.logger.debug('check sub_testcase:%s', sub_testcase) - if self.get_sub_testcase(sub_testcase, - db_result['details']['errors']): + try: + if self.get_sub_testcase(sub_testcase, + db_result['details']['errors']): + testcase.sub_testcase_passed(sub_testcase, 'FAIL') + testcase_passed = 'FAIL' + continue + if self.get_sub_testcase(sub_testcase, + db_result['details']['skipped']): + testcase.sub_testcase_passed(sub_testcase, 'SKIP') + else: + testcase.sub_testcase_passed(sub_testcase, 'PASS') + except KeyError: testcase.sub_testcase_passed(sub_testcase, 'FAIL') testcase_passed = 'FAIL' - continue - if self.get_sub_testcase(sub_testcase, - db_result['details']['skipped']): - testcase.sub_testcase_passed(sub_testcase, 'SKIP') - else: - testcase.sub_testcase_passed(sub_testcase, 'PASS') if testcase_passed == 'SKIP': for sub_testcase in sub_testcase_list: diff --git a/dovetail/run.py b/dovetail/run.py index f268f921..607e1b15 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -54,8 +54,8 @@ def run_test(testsuite, testarea, logger): continue run_testcase = True - if testcase.exceed_max_retry_times(): - run_testcase = False + # if testcase.exceed_max_retry_times(): + # run_testcase = False # if testcase.script_result_acquired(): # run_testcase = False |