summaryrefslogtreecommitdiffstats
path: root/dovetail
diff options
context:
space:
mode:
authorStamatis Katsaounis <mokats@intracom-telecom.com>2019-03-27 09:38:14 +0200
committerxudan <xudan16@huawei.com>2019-03-28 23:16:43 -0400
commit9bb85082e261f5df9dbd0a6bbeb6e315d8f67cdc (patch)
tree319a6d9d6a702dc5bc7ee268d8ea5fa6931f5051 /dovetail
parentf27b1382a87c432487816cfad6e5c341250d16b2 (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>
Diffstat (limited to 'dovetail')
-rw-r--r--dovetail/container.py4
-rw-r--r--dovetail/report.py4
-rw-r--r--dovetail/tests/unit/test_report.py10
3 files changed, 10 insertions, 8 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index 250bb54..71cb412 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 556fc76..36a33a4 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 e44c6ac..53b06cb 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)