summaryrefslogtreecommitdiffstats
path: root/dovetail/run.py
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2016-10-14 10:21:11 +0000
committerxudan <xudan16@huawei.com>2016-10-14 12:26:15 +0000
commit2fccbbd5a616186e10c30de6262263df1f1f0740 (patch)
tree8526fd5398d1c159c5f5f4d35a7605fb3780d4f5 /dovetail/run.py
parent2c7f65363fc429fbf58bacfae9edbf8e601d01c7 (diff)
[dovetail_tool] Fix the python style scanned by flake8
JIRA: DOVETAIL-34 Change-Id: Ib9a6dd254f1d77b0cbbfa66e8e1e44df1ce14a4b Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/run.py')
-rwxr-xr-xdovetail/run.py22
1 files changed, 12 insertions, 10 deletions
diff --git a/dovetail/run.py b/dovetail/run.py
index 85871fab..8fe27c59 100755
--- a/dovetail/run.py
+++ b/dovetail/run.py
@@ -9,28 +9,28 @@
import click
-import yaml
-import os
-import time
import utils.dovetail_logger as dt_logger
-import utils.dovetail_utils as dt_utils
from container import Container
-from testcase import *
-from report import *
-from conf.dovetail_config import *
+from testcase import Testcase
+from testcase import Scenario
+from report import Report
+from conf.dovetail_config import SCENARIO_NAMING_FMT
logger = dt_logger.Logger('run.py').getLogger()
+
def load_scenario(scenario):
Scenario.load()
return Scenario.get(SCENARIO_NAMING_FMT % scenario)
+
def load_testcase():
Testcase.load()
+
def run_test(scenario):
for testcase_name in scenario['testcase_list']:
logger.info('>>[testcase]: %s' % (testcase_name))
@@ -49,11 +49,12 @@ def run_test(scenario):
logger.debug('container id:%s' % container_id)
if not Testcase.prepared(testcase.script_type()):
- cmds = Testcase.pre_condition(testcase.script_type())['cmds']
+ cmds = \
+ Testcase.pre_condition_cls(testcase.script_type())['cmds']
if cmds:
for cmd in cmds:
Container.exec_cmd(container_id, cmd)
- Testcase.prepared(testcase.script_type(),True)
+ Testcase.prepared(testcase.script_type(), True)
if not testcase.prepare_cmd():
logger.error('failed to prepare testcase:%s' % testcase.name())
@@ -61,13 +62,14 @@ def run_test(scenario):
for cmd in testcase.cmds:
Container.exec_cmd(container_id, cmd)
- #testcase.post_condition()
+ # testcase.post_condition()
Container.clean(container_id)
db_result = Report.get_result(testcase)
Report.check_result(testcase, db_result)
+
@click.command()
@click.option('--scenario', default='basic', help='certification scenario')
def main(scenario):