summaryrefslogtreecommitdiffstats
path: root/dovetail/test_runner.py
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2016-12-21 02:41:09 +0000
committerxudan <xudan16@huawei.com>2016-12-26 09:20:34 +0000
commit352bd08bce665e41c23dfce930b315533d39df0b (patch)
treecb449c9a14b69404d45b0c49afb21e7f1f382cd3 /dovetail/test_runner.py
parentf87b8d9136682c9617449bb8595230c074c5d8e3 (diff)
dovetail tool: reorganize function prepare_cmd in testcase.py
1. move the common statements in prepare_cmd of class FunctestTestcase and Testcase into parse_cmd. JIRA: DOVETAIL-163 Change-Id: I61a0a24b47cfc9e8d49ca9c62fafbac7cce21111 Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/test_runner.py')
-rw-r--r--dovetail/test_runner.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py
index 70dd2345..8315380a 100644
--- a/dovetail/test_runner.py
+++ b/dovetail/test_runner.py
@@ -49,9 +49,9 @@ class DockerRunner(object):
if not failed:
self.testcase.prepared(True)
- if not self.testcase.prepare_cmd():
+ if not self.testcase.prepare_cmd(self.type):
self.logger.error('failed to prepare testcase:%s',
- self.testcase.name)
+ self.testcase.name())
else:
for cmd in self.testcase.cmds:
ret, msg = Container.exec_cmd(container_id, cmd)
@@ -112,7 +112,7 @@ class ShellRunner(object):
if not failed:
self.testcase.prepared(True)
- if not self.testcase.prepare_cmd():
+ if not self.testcase.prepare_cmd(self.type):
self.logger.error('failed to prepare cmd:%s',
self.testcase.name())
else: