From e37ce9db19fb583f60fc8d31a4093a8313ff47b8 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Sat, 16 Feb 2019 19:48:58 +0200 Subject: Remove deprecated ONAP lifecycle test case This patch removes the ONAP lifecycle deprecated test case. Furthermore, it clears helper functions as well as unwanted configuration. Change-Id: Ib958457cf120ffb641a72be028d3a031741c44c6 Signed-off-by: Stamatis Katsaounis --- dovetail/tests/unit/test_container.py | 136 +------------------------------- dovetail/tests/unit/test_report.py | 110 +------------------------- dovetail/tests/unit/test_run.py | 2 - dovetail/tests/unit/test_test_runner.py | 4 +- dovetail/tests/unit/test_testcase.py | 2 +- 5 files changed, 7 insertions(+), 247 deletions(-) (limited to 'dovetail/tests') diff --git a/dovetail/tests/unit/test_container.py b/dovetail/tests/unit/test_container.py index 803566b1..6a8b99fc 100644 --- a/dovetail/tests/unit/test_container.py +++ b/dovetail/tests/unit/test_container.py @@ -35,22 +35,6 @@ class ContainerTesting(unittest.TestCase): def tearDown(self): pass - @patch('dovetail.container.dt_cfg') - @patch.object(Container, 'docker_copy') - def test_set_vnftest_conf_file(self, mock_copy, mock_config): - source_file = 'source' - destination_file = 'destination_file' - mock_config.dovetail_config = { - 'vnftest': { - 'vnftest_conf': [{ - 'src_file': source_file, - 'dest_file': destination_file}]}} - - self.container.set_vnftest_conf_file() - - mock_copy.assert_called_once_with( - source_file, destination_file) - @patch('dovetail.container.dt_cfg') @patch.object(Container, 'copy_file') def test_copy_files_in_container(self, mock_copy, mock_config): @@ -416,53 +400,6 @@ class ContainerTesting(unittest.TestCase): self.assertEquals(self.logger, self.container.logger) - @patch('dovetail.container.dt_cfg') - @patch('dovetail.container.os.path') - def test_set_vnftest_config_no_file(self, mock_path, mock_config): - v_one = 'v_one' - v_two = 'v_two' - v_three = 'v_three' - v_four = 'v_four' - v_five = 'v_five' - mock_path.join.return_value = '/'.join([v_two, v_three]) - mock_path.isfile.return_value = False - mock_config.dovetail_config = { - 'result_dir': v_one, 'config_dir': v_two, - 'pri_key': v_three, 'vnftest': { - 'result': {'log': v_four, 'key_path': v_five}}} - - expected = '-v {}:{} '.format(v_one, v_four) - result = self.container.set_vnftest_config() - - mock_path.join.assert_called_once_with(v_two, v_three) - mock_path.isfile.assert_called_once_with('/'.join([v_two, v_three])) - self.logger.debug.assert_called_once_with( - 'Key file {} is not found'.format('/'.join([v_two, v_three]))) - self.assertEquals(expected, result) - - @patch('dovetail.container.dt_cfg') - @patch('dovetail.container.os.path') - def test_set_vnftest_config(self, mock_path, mock_config): - v_one = 'v_one' - v_two = 'v_two' - v_three = 'v_three' - v_four = 'v_four' - v_five = 'v_five' - mock_path.join.return_value = '/'.join([v_two, v_three]) - mock_path.isfile.return_value = True - mock_config.dovetail_config = { - 'result_dir': v_one, 'config_dir': v_two, - 'pri_key': v_three, 'vnftest': { - 'result': {'log': v_four, 'key_path': v_five}}} - - expected = '-v {}:{} -v {}/{}:{} '.format(v_one, v_four, v_two, - v_three, v_five) - result = self.container.set_vnftest_config() - - mock_path.join.assert_called_once_with(v_two, v_three) - mock_path.isfile.assert_called_once_with('/'.join([v_two, v_three])) - self.assertEquals(expected, result) - @patch('dovetail.container.dt_utils') @patch('dovetail.container.dt_cfg') def test_create(self, mock_config, mock_utils): @@ -485,7 +422,7 @@ class ContainerTesting(unittest.TestCase): call('volumes', project_config)]) mock_utils.get_hosts_info.assert_called_once_with(self.logger) mock_utils.exec_cmd.assert_called_once_with( - 'sudo docker run opts envs volume_one volume_two host_info ' + 'sudo docker run opts envs volume_one volume_two host_info ' 'docker_image shell', self.logger) self.assertEquals(expected, result) @@ -506,12 +443,10 @@ class ContainerTesting(unittest.TestCase): @patch('dovetail.container.dt_utils') @patch('dovetail.container.dt_cfg') - @patch('dovetail.container.os.getenv') - def test_create_error(self, mock_getenv, mock_config, mock_utils): + def test_create_error(self, mock_config, mock_utils): docker_image = 'docker_image' mock_utils.get_value_from_dict.side_effect = [ 'opts', 'shell', 'envs', ['volume_one']] - mock_getenv.side_effect = ['True', 'dovetail_home', None, 'True'] mock_utils.get_hosts_info.return_value = 'host_info' mock_utils.check_https_enabled.return_value = True mock_utils.exec_cmd.return_value = (1, 'error') @@ -526,71 +461,6 @@ class ContainerTesting(unittest.TestCase): call('volumes', project_config)]) mock_utils.get_hosts_info.assert_called_once_with(self.logger) mock_utils.exec_cmd.assert_called_once_with( - 'sudo docker run opts envs volume_one host_info ' + 'sudo docker run opts envs volume_one host_info ' 'docker_image shell', self.logger) self.assertEquals(None, result) - - @patch('dovetail.container.dt_utils') - @patch('dovetail.container.dt_cfg') - @patch('dovetail.container.os.getenv') - @patch.object(Container, 'set_vnftest_config') - @patch.object(Container, 'set_vnftest_conf_file') - def test_create_vnftest(self, mock_setvnffile, mock_setvnfconf, - mock_getenv, mock_config, mock_utils): - docker_image = 'docker_image' - container_id = 'container_id' - mock_utils.get_value_from_dict.side_effect = [ - 'opts', 'shell', 'envs', ['volume_one']] - mock_getenv.side_effect = ['False', 'dovetail_home', 'cacert', 'True'] - mock_setvnfconf.return_value = 'vnftest_config' - mock_utils.get_hosts_info.return_value = 'host_info' - mock_utils.exec_cmd.return_value = (0, container_id) - project_config = {} - mock_config.dovetail_config = {'vnftest': project_config} - - expected = container_id - self.container.valid_type = 'vnftest' - result = self.container.create(docker_image) - self.container.valid_type = 'bottlenecks' - - mock_utils.get_value_from_dict.assert_has_calls([ - call('opts', project_config), - call('shell', project_config), - call('envs', project_config), - call('volumes', project_config)]) - mock_utils.get_hosts_info.assert_called_once_with(self.logger) - mock_setvnfconf.assert_called_once_with() - mock_setvnffile.assert_called_once_with(container_id) - mock_utils.exec_cmd.assert_called_once_with( - 'sudo docker run opts envs volume_one vnftest_config host_info ' - 'docker_image shell', - self.logger) - self.assertEquals(expected, result) - - @patch('dovetail.container.dt_utils') - @patch('dovetail.container.dt_cfg') - @patch('dovetail.container.os.getenv') - @patch.object(Container, 'set_vnftest_config') - def test_create_vnftest_error(self, mock_setvnfconf, - mock_getenv, mock_config, mock_utils): - docker_image = 'docker_image' - mock_utils.get_value_from_dict.side_effect = [ - 'opts', 'shell', 'envs', ['volume_one']] - mock_getenv.return_value = 'True' - mock_setvnfconf.return_value = None - mock_config.dovetail_config = { - 'vnftest': 'value', - 'build_tag': 'v_one'} - - self.container.valid_type = 'vnftest' - result = self.container.create(docker_image) - self.container.valid_type = 'bottlenecks' - - mock_utils.get_value_from_dict.assert_has_calls([ - call('opts', 'value'), - call('shell', 'value'), - call('envs', 'value'), - call('volumes', 'value')]) - mock_utils.get_hosts_info.assert_called_once_with(self.logger) - mock_setvnfconf.assert_called_once_with() - self.assertEquals(None, result) diff --git a/dovetail/tests/unit/test_report.py b/dovetail/tests/unit/test_report.py index d97cacf8..acd44141 100644 --- a/dovetail/tests/unit/test_report.py +++ b/dovetail/tests/unit/test_report.py @@ -34,20 +34,18 @@ class ReportTesting(unittest.TestCase): dt_report.FunctestK8sCrawler.logger = None dt_report.YardstickCrawler.logger = None dt_report.BottlenecksCrawler.logger = None - dt_report.VnftestCrawler.logger = None dt_report.OnapVtpCrawler.logger = None dt_report.OnapVvpCrawler.logger = None dt_report.FunctestChecker.logger = None dt_report.FunctestK8sChecker.logger = None dt_report.YardstickChecker.logger = None dt_report.BottlenecksChecker.logger = None - dt_report.VnftestChecker.logger = None dt_report.OnapVtpChecker.logger = None dt_report.OnapVvpChecker.logger = None dt_report.Report.logger = None dt_report.Report.results = { 'functest': {}, 'yardstick': {}, 'functest-k8s': {}, - 'bottlenecks': {}, 'shell': {}, 'vnftest': {}, 'onap-vtp': {}, + 'bottlenecks': {}, 'shell': {}, 'onap-vtp': {}, 'onap-vvp': {}} def _produce_report_initial_text(self, report_data): @@ -878,85 +876,6 @@ class ReportTesting(unittest.TestCase): mock_load.assert_called_once_with(file_obj) self.assertEquals('result', result) - @patch('dovetail.report.dt_logger') - def test_vnftest_crawler_create_log(self, mock_logger): - getlogger_obj = Mock() - logger_obj = Mock() - logger_obj.getLogger.return_value = getlogger_obj - mock_logger.Logger.return_value = logger_obj - - dt_report.VnftestCrawler.create_log() - - self.assertEquals(getlogger_obj, dt_report.VnftestCrawler.logger) - - @patch('dovetail.report.os.path') - def test_vnftest_crawler_crawl_not_exists(self, mock_path): - logger_obj = Mock() - dt_report.VnftestCrawler.logger = logger_obj - mock_path.exists.return_value = False - file_path = 'file_path' - - crawler = dt_report.VnftestCrawler() - result = crawler.crawl(None, file_path) - - mock_path.exists.assert_called_once_with(file_path) - logger_obj.error.assert_called_once_with( - 'Result file not found: {}'.format(file_path)) - self.assertEquals(None, result) - - @patch('__builtin__.open') - @patch('dovetail.report.json.loads') - @patch('dovetail.report.os.path') - def test_vnftest_crawler_crawl(self, mock_path, mock_loads, - mock_open): - dt_report.VnftestCrawler.logger = Mock() - mock_path.exists.return_value = True - file_path = 'file_path' - testcase_obj = Mock() - file_obj = Mock() - mock_open.return_value.__enter__.return_value = [file_obj] - data_dict = { - 'result': { - 'criteria': 'PASS' - } - } - mock_loads.return_value = data_dict - - crawler = dt_report.VnftestCrawler() - result = crawler.crawl(testcase_obj, file_path) - expected = {'criteria': 'PASS'} - - mock_path.exists.assert_called_once_with(file_path) - mock_open.assert_called_once_with(file_path, 'r') - mock_loads.assert_called_once_with(file_obj) - self.assertEquals(expected, result) - - @patch('__builtin__.open') - @patch('dovetail.report.json.loads') - @patch('dovetail.report.os.path') - def test_vnftest_crawler_crawl_key_error(self, mock_path, mock_loads, - mock_open): - logger_obj = Mock() - dt_report.VnftestCrawler.logger = logger_obj - mock_path.exists.return_value = True - file_path = 'file_path' - testcase_obj = Mock() - file_obj = Mock() - mock_open.return_value.__enter__.return_value = [file_obj] - - mock_loads.return_value = {} - - crawler = dt_report.VnftestCrawler() - result = crawler.crawl(testcase_obj, file_path) - expected = {'criteria': 'FAIL'} - - mock_path.exists.assert_called_once_with(file_path) - mock_open.assert_called_once_with(file_path, 'r') - mock_loads.assert_called_once_with(file_obj) - logger_obj.exception.assert_called_once_with( - "Pass flag not found 'result'") - self.assertEquals(expected, result) - @patch('dovetail.report.dt_logger') def test_onapvtp_crawler_create_log(self, mock_logger): getlogger_obj = Mock() @@ -1425,33 +1344,6 @@ class ReportTesting(unittest.TestCase): testcase_obj.passed.assert_called_once_with(False) - @patch('dovetail.report.dt_logger') - def test_vnftest_checker_create_log(self, mock_logger): - getlogger_obj = Mock() - logger_obj = Mock() - logger_obj.getLogger.return_value = getlogger_obj - mock_logger.Logger.return_value = logger_obj - - dt_report.VnftestChecker.create_log() - - self.assertEquals(getlogger_obj, dt_report.VnftestChecker.logger) - - def test_vnftest_check_result(self): - testcase_obj = Mock() - result = {'criteria': 'PASS'} - - dt_report.VnftestChecker.check(testcase_obj, result) - - testcase_obj.passed.assert_called_once_with('PASS') - - def test_vnftest_check_result_none(self): - testcase_obj = Mock() - result = {} - - dt_report.VnftestChecker.check(testcase_obj, result) - - testcase_obj.passed.assert_called_once_with('FAIL') - def test_checker_factory(self): result = dt_report.CheckerFactory.create('shell') self.assertEquals(dt_report.ShellChecker, result.__class__) diff --git a/dovetail/tests/unit/test_run.py b/dovetail/tests/unit/test_run.py index fed198c0..80b5eca6 100644 --- a/dovetail/tests/unit/test_run.py +++ b/dovetail/tests/unit/test_run.py @@ -211,11 +211,9 @@ class RunTesting(unittest.TestCase): mock_report.Report.create_log.assert_called_once_with() mock_report.FunctestCrawler.create_log.assert_called_once_with() mock_report.YardstickCrawler.create_log.assert_called_once_with() - mock_report.VnftestCrawler.create_log.assert_called_once_with() mock_report.BottlenecksCrawler.create_log.assert_called_once_with() mock_report.FunctestChecker.create_log.assert_called_once_with() mock_report.YardstickChecker.create_log.assert_called_once_with() - mock_report.VnftestChecker.create_log.assert_called_once_with() mock_report.BottlenecksChecker.create_log.assert_called_once_with() mock_testcase.Testcase.create_log.assert_called_once_with() mock_testcase.Testsuite.create_log.assert_called_once_with() diff --git a/dovetail/tests/unit/test_test_runner.py b/dovetail/tests/unit/test_test_runner.py index 0eb12135..345dfd65 100644 --- a/dovetail/tests/unit/test_test_runner.py +++ b/dovetail/tests/unit/test_test_runner.py @@ -211,9 +211,9 @@ class TestRunnerTesting(unittest.TestCase): @patch('dovetail.test_runner.dt_utils') @patch('dovetail.test_runner.os') def test_archive_logs_no_files(self, mock_os, mock_utils, mock_config): - t_runner.VnftestRunner.create_log() + t_runner.FunctestRunner.create_log() mock_config.dovetail_config = {'result_dir': 'result_dir'} - docker_runner = t_runner.VnftestRunner(self.testcase) + docker_runner = t_runner.FunctestRunner(self.testcase) mock_os.environ = {'DOVETAIL_HOME': 'dovetail_home'} mock_utils.get_value_from_dict.return_value = [] diff --git a/dovetail/tests/unit/test_testcase.py b/dovetail/tests/unit/test_testcase.py index b224a130..e3f2a64c 100644 --- a/dovetail/tests/unit/test_testcase.py +++ b/dovetail/tests/unit/test_testcase.py @@ -89,7 +89,7 @@ class TestcaseTesting(unittest.TestCase): @patch('dovetail.testcase.dt_cfg') @patch.object(tcase.Testcase, 'parse_cmd') def test_prepare_cmd_testcase_cmd(self, mock_parse, mock_config): - testcase = tcase.VnftestTestcase(self.testcase_yaml) + testcase = tcase.ShellTestcase(self.testcase_yaml) testcase.testcase['validate']['cmds'] = ['cmd'] mock_config.dovetail_config = {} mock_parse.return_value = True -- cgit 1.2.3-korg