diff options
| author |   xudan <xudan16@huawei.com> | 2018-10-25 04:03:23 -0400 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2018-10-31 00:12:34 -0400 |
| commit | 13a9eb11068987beec3c8d6e058142c07c8a66a6 (patch) | |
| tree | 3ac35fb1465451e90b4e28ae1853265a11b9d293 | |
| parent | 7cd5c4c60b3f9a9893c2801a39061489ecfa6ae0 (diff) | |
CI verify jobs failed due to the update of tox
The LF pod used to run the CI verify jobs have updated the version of tox.
So the CI verify jobs failed.
See https://build.opnfv.org/ci/view/dovetail/job/dovetail-merge-master/476/console
Fix the python format errors
Ignore error 'W503 line break before binary operator'.
Change-Id: Ic2df070447bbea39c877ce7a394d733a95064bb1
Signed-off-by: xudan <xudan16@huawei.com>
| -rw-r--r-- | dovetail/container.py | 7 | ||||
| -rw-r--r-- | dovetail/report.py | 7 | ||||
| -rw-r--r-- | dovetail/testcase.py | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
4 files changed, 9 insertions, 11 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index 89c68ccb..be92a671 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -161,10 +161,9 @@ class Container(object): '{hosts_config} {openrc} {cacert_volume} {config_volume} ' \ '{result_volume} {images_volume} {docker_image} /bin/bash' \ .format(**locals()) - dt_utils.exec_cmd(cmd, cls.logger) - ret, container_id = \ - dt_utils.exec_cmd("sudo docker ps | grep " + docker_image + - " | awk '{print $1}' | head -1", cls.logger) + ret, container_id = dt_utils.exec_cmd(cmd, cls.logger) + if ret != 0: + return None cls.container_list[valid_type] = container_id if valid_type.lower() == 'vnftest': diff --git a/dovetail/report.py b/dovetail/report.py index be8d0827..189fba91 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -265,8 +265,7 @@ class FunctestCrawler(Crawler): for jsonfile in f: try: data = json.loads(jsonfile) - if (testcase_name == data['case_name'] or - data['project_name'] == "sdnvpn") and \ + if testcase_name == data['case_name'] and \ build_tag == data['build_tag']: criteria = data['criteria'] timestart = data['start_date'] @@ -465,8 +464,8 @@ class FunctestChecker(object): def get_sub_testcase(sub_testcase, result): if not result: return False - sub_testcase = re.sub("\[.*?\]", "", sub_testcase) - reg = sub_testcase + '[\s+\d+]' + sub_testcase = re.sub(r"\[.*?\]", "", sub_testcase) + reg = sub_testcase + r'[\s+\d+]' find_reg = re.compile(reg) for tc in result: match = find_reg.findall(tc) diff --git a/dovetail/testcase.py b/dovetail/testcase.py index 8eec9388..ba289053 100644 --- a/dovetail/testcase.py +++ b/dovetail/testcase.py @@ -298,8 +298,8 @@ class Testcase(object): "test suite {}".format(testsuite['name'])) else: selected_tests += optional - if (not dt_cfg.dovetail_config['mandatory'] and - not dt_cfg.dovetail_config['optional']): + if (not dt_cfg.dovetail_config['mandatory'] + and not dt_cfg.dovetail_config['optional']): if mandatory: selected_tests += mandatory if optional: @@ -34,7 +34,7 @@ commands = python setup.py testr --coverage \ [flake8] show-source = True -ignore = E123,E125,H803,E722 +ignore = E123,E125,H803,E722,W503 exclude = .tox,dist,docs,*egg,build,.venv,.git [testenv:docs] |