diff options
| author |   hongbo tian <hongbo.tianhongbo@huawei.com> | 2017-02-18 03:01:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-18 03:01:05 +0000 |
| commit | bb1c8231f69f8e55d5e7411618d0c2e4d06287ad (patch) | |
| tree | bfa72c5d9fd83de86b3a914b97c676d60333b777 /dovetail/test_runner.py | |
| parent | 68588d411dd58c67f3bca1130840269f26a26a00 (diff) | |
| parent | 931942e3719dda8a269acb63f320146d7327fdd6 (diff) | |
Merge "dovetail tool: skip testcase status added"
Diffstat (limited to 'dovetail/test_runner.py')
| -rw-r--r-- | dovetail/test_runner.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index 29217f5f..588f049a 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -38,15 +38,15 @@ class DockerRunner(object): self.logger.debug('container id:%s', container_id) if not self.testcase.prepared(): - failed = False + prepare_failed = False cmds = self.testcase.pre_condition() if cmds: for cmd in cmds: ret, msg = Container.exec_cmd(container_id, cmd) if ret != 0: - failed = True + prepare_failed = True break - if not failed: + if not prepare_failed: self.testcase.prepared(True) if not self.testcase.prepare_cmd(self.type): @@ -98,18 +98,18 @@ class ShellRunner(object): self.logger.debug('create runner:%s', self.type) def run(self): - passed = True - failed = False - result = {'pass': True, 'results': []} + testcase_passed = 'PASS' + prepare_failed = False + result = {'pass': 'PASS', 'results': []} if not self.testcase.prepared(): cmds = self.testcase.pre_condition() for cmd in cmds: ret, msg = dt_utils.exec_cmd(cmd, self.logger) result['results'].append((cmd, ret, msg)) if ret != 0: - failed = True + prepare_failed = True break - if not failed: + if not prepare_failed: self.testcase.prepared(True) if not self.testcase.prepare_cmd(self.type): @@ -120,9 +120,9 @@ class ShellRunner(object): ret, msg = dt_utils.exec_cmd(cmd, self.logger) result['results'].append((cmd, ret, msg)) if ret != 0: - passed = False + testcase_passed = 'FAIL' - result['pass'] = passed + result['pass'] = testcase_passed cmds = self.testcase.post_condition() for cmd in cmds: |