diff options
| author |   Stamatis Katsaounis <mokats@intracom-telecom.com> | 2019-03-27 09:38:14 +0200 |
|---|---|---|
| committer |   xudan <xudan16@huawei.com> | 2019-03-28 23:16:43 -0400 |
| commit | 9bb85082e261f5df9dbd0a6bbeb6e315d8f67cdc (patch) | |
| tree | 319a6d9d6a702dc5bc7ee268d8ea5fa6931f5051 | |
| parent | f27b1382a87c432487816cfad6e5c341250d16b2 (diff) | |
Fix VVP test case
This patch adds check for no environment variables provided to
container configuration. Furthermore, it changes the check results
file to a list of check result files.
Change-Id: I2112ee1fd4b3156608d8a27dd3b9c90dbe35a24c
Signed-off-by: Stamatis Katsaounis <mokats@intracom-telecom.com>
Co-Authored-By: Panagiotis Karalis <pkaralis@intracom-telecom.com>
| -rw-r--r-- | docs/testing/user/userguide/vnf_test_guide.rst | 1 | ||||
| -rw-r--r-- | dovetail/container.py | 4 | ||||
| -rw-r--r-- | dovetail/report.py | 4 | ||||
| -rw-r--r-- | dovetail/tests/unit/test_report.py | 10 | ||||
| -rw-r--r-- | etc/testcase/onap-vvp.validate.heat.yml | 3 |
5 files changed, 13 insertions, 9 deletions
diff --git a/docs/testing/user/userguide/vnf_test_guide.rst b/docs/testing/user/userguide/vnf_test_guide.rst index 63ed04bf..f37858cd 100644 --- a/docs/testing/user/userguide/vnf_test_guide.rst +++ b/docs/testing/user/userguide/vnf_test_guide.rst @@ -89,6 +89,7 @@ test results are going to be saved: $ mkdir -p ${DOVETAIL_HOME}/pre_config $ mkdir -p ${DOVETAIL_HOME}/results + $ chmod 777 ${DOVETAIL_HOME}/results There should be a file `env_config.sh` inside this directory to provide some info. diff --git a/dovetail/container.py b/dovetail/container.py index 250bb54a..71cb4123 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -60,7 +60,9 @@ class Container(object): if not shell: return None env_list = dt_utils.get_value_from_dict('envs', project_cfg) - kwargs['environment'] = [env for env in env_list if env is not None] + if env_list: + kwargs['environment'] = \ + [env for env in env_list if env is not None] volume_list = dt_utils.get_value_from_dict('volumes', project_cfg) kwargs['volumes'] = [vol for vol in volume_list if vol is not None] kwargs['extra_hosts'] = dt_utils.get_hosts_info(self.logger) diff --git a/dovetail/report.py b/dovetail/report.py index 556fc76d..36a33a49 100644 --- a/dovetail/report.py +++ b/dovetail/report.py @@ -515,8 +515,8 @@ class OnapVvpCrawler(Crawler): def create_log(cls): cls.logger = dt_logger.Logger(__name__ + '.OnapVvpCrawler').getLogger() - def crawl(self, testcase, file_path): - return self.crawl_from_file(testcase, file_path) + def crawl(self, testcase, file_paths): + return self.crawl_from_file(testcase, file_paths[0]) def crawl_from_file(self, testcase, file_path): if not os.path.exists(file_path): diff --git a/dovetail/tests/unit/test_report.py b/dovetail/tests/unit/test_report.py index e44c6ac8..53b06cb9 100644 --- a/dovetail/tests/unit/test_report.py +++ b/dovetail/tests/unit/test_report.py @@ -980,7 +980,7 @@ class ReportTesting(unittest.TestCase): file_path = 'file_path' crawler = dt_report.OnapVvpCrawler() - result = crawler.crawl(None, file_path) + result = crawler.crawl(None, [file_path]) mock_path.exists.assert_called_once_with(file_path) logger_obj.error.assert_called_once_with( @@ -1000,7 +1000,7 @@ class ReportTesting(unittest.TestCase): mock_open.return_value.__enter__.return_value = file_obj crawler = dt_report.OnapVvpCrawler() - result = crawler.crawl(testcase_obj, file_path) + result = crawler.crawl(testcase_obj, [file_path]) expected = {'criteria': 'PASS'} mock_path.exists.assert_called_once_with(file_path) @@ -1022,7 +1022,7 @@ class ReportTesting(unittest.TestCase): mock_open.return_value.__enter__.return_value = file_obj crawler = dt_report.OnapVvpCrawler() - result = crawler.crawl(testcase_obj, file_path) + result = crawler.crawl(testcase_obj, [file_path]) expected = {'criteria': 'FAIL'} mock_path.exists.assert_called_once_with(file_path) @@ -1044,7 +1044,7 @@ class ReportTesting(unittest.TestCase): mock_open.return_value.__enter__.return_value = file_obj crawler = dt_report.OnapVvpCrawler() - result = crawler.crawl(testcase_obj, file_path) + result = crawler.crawl(testcase_obj, [file_path]) expected = {'criteria': 'FAIL'} mock_path.exists.assert_called_once_with(file_path) @@ -1068,7 +1068,7 @@ class ReportTesting(unittest.TestCase): mock_open.return_value.__enter__.return_value = file_obj crawler = dt_report.OnapVvpCrawler() - result = crawler.crawl(testcase_obj, file_path) + result = crawler.crawl(testcase_obj, [file_path]) expected = {'criteria': 'FAIL'} mock_path.exists.assert_called_once_with(file_path) diff --git a/etc/testcase/onap-vvp.validate.heat.yml b/etc/testcase/onap-vvp.validate.heat.yml index a4ca9ab6..2cdab7cc 100644 --- a/etc/testcase/onap-vvp.validate.heat.yml +++ b/etc/testcase/onap-vvp.validate.heat.yml @@ -12,5 +12,6 @@ onap-vvp.validate.heat: dest_archive_files: - onap-vvp_logs/failures - onap-vvp_logs/report.json - check_results_file: onap-vvp_logs/report.json + check_results_files: + - onap-vvp_logs/report.json sub_testcase_list: |