From 82bc118989534ae75b5eea0c00f6d793558f3150 Mon Sep 17 00:00:00 2001 From: xudan Date: Sat, 26 May 2018 02:52:39 -0400 Subject: Remove functest_testsuite and functest_testcase in dovetail_config.yml The 2 sections 'functest_testsuite' and 'functest_testcase' are used by all Functest test cases. They aim to parse the results of Tempest sub test cases. Remove them, and check the sub test case list, 1. if it's empty, that means no need to check sub test cases 2. if it is not empty, check the sub test cases one by one. Additional, remove some useless keys in dovetail_config.yml JIRA: DOVETAIL-658 Change-Id: Ic829264b0c8eaedd8e2b3fa55b38a34644482c20 Signed-off-by: xudan --- dovetail/test_runner.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'dovetail/test_runner.py') diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py index c49182b8..cb5578b0 100644 --- a/dovetail/test_runner.py +++ b/dovetail/test_runner.py @@ -62,15 +62,7 @@ class DockerRunner(object): if not Container.pull_image(docker_image): self.logger.error("Failed to pull the image.") return - # for sdnvpn, there is a need to download needed images to config_dir - # in dovetail_config.yml first. - if 'sdnvpn' in str(self.testcase.name()): - img_name = dt_cfg.dovetail_config['sdnvpn_image'] - img_file = os.path.join(dt_cfg.dovetail_config['images_dir'], - img_name) - if not os.path.isfile(img_file): - self.logger.error('Image {} not found.'.format(img_name)) - return + container_id = Container.create(self.testcase.validate_type(), self.testcase.name(), docker_image) if not container_id: -- cgit 1.2.3-korg