From 352bd08bce665e41c23dfce930b315533d39df0b Mon Sep 17 00:00:00 2001 From: xudan Date: Wed, 21 Dec 2016 02:41:09 +0000 Subject: 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 --- dovetail/test_runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dovetail/test_runner.py') 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: -- cgit 1.2.3-korg