summaryrefslogtreecommitdiffstats
path: root/dovetail/test_runner.py
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2017-02-08 02:52:27 -0500
committerMatthewLi <matthew.lijun@huawei.com>2017-02-17 01:39:13 -0500
commit931942e3719dda8a269acb63f320146d7327fdd6 (patch)
treefe2b6b8029c1ae4aba51478ce9205b7c6961ea1a /dovetail/test_runner.py
parent29500fcfd71ae240dd9258378328483f02f916eb (diff)
dovetail tool: skip testcase status added
JIRA: DOVETAIL-344 1) testcase status, True/False --> PASS/SKIP/FAIL, so skipped testcase in tempest can be figured out details can be seen in https://etherpad.opnfv.org/p/dovetail_report 2) some variable name changed more readable, such as passed-->testcase_passed failed--> prepare_failed 3) "dovetail report" minor amend according to 1) Change-Id: Ibe8e50693fc474d78e7d0fb89257f34703248579 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'dovetail/test_runner.py')
-rw-r--r--dovetail/test_runner.py20
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: