From c7c4cc227ed9447b4fdceeceece35384404bd7ec Mon Sep 17 00:00:00 2001 From: Moshe Date: Wed, 20 Jun 2018 10:23:28 +0300 Subject: Add validation abilities to test cases Change-Id: I76b28e6170d6e91836b195d58c0b882168c11a67 Issue-ID: VNFSDK-275 Signed-off-by: Moshe Add unit tests Issue-ID: VNFSDK-275 Change-Id: I34bc9a11e16e4092fdad3b4a1733c7219e624f5f Signed-off-by: Moshe add unit tests Issue-ID: VNFSDK-275 Change-Id: Ib99c3521438b002e0d8aaff9870224673e34899f Signed-off-by: Moshe add unit tests Issue-ID: VNFSDK-275 Change-Id: I1ac560dfb40df5f346b0db8f40b8c52a2fb6b350 Signed-off-by: Moshe --- .../unit/core/no_constraint_with_args_step_sample.yaml | 5 ++--- vnftest/tests/unit/core/test_task.py | 17 +---------------- 2 files changed, 3 insertions(+), 19 deletions(-) (limited to 'vnftest/tests/unit/core') diff --git a/vnftest/tests/unit/core/no_constraint_with_args_step_sample.yaml b/vnftest/tests/unit/core/no_constraint_with_args_step_sample.yaml index 3667230..9b8b09a 100644 --- a/vnftest/tests/unit/core/no_constraint_with_args_step_sample.yaml +++ b/vnftest/tests/unit/core/no_constraint_with_args_step_sample.yaml @@ -19,12 +19,11 @@ schema: "vnftest:suite:0.1" name: "suite_1" -test_cases_dir: "tests/onap/test_cases/" test_cases: - - file_name: onap_vnftest_tc001.yaml + file_name: tests/onap/test_cases/onap_vnftest_tc001.yaml - - file_name: onap_vnftest_tc002.yaml + file_name: tests/onap/test_cases/onap_vnftest_tc002.yaml task_args: huawei-pod1: '{"host": "node1.LF","target": "node2.LF"}' diff --git a/vnftest/tests/unit/core/test_task.py b/vnftest/tests/unit/core/test_task.py index b136960..21947c9 100644 --- a/vnftest/tests/unit/core/test_task.py +++ b/vnftest/tests/unit/core/test_task.py @@ -74,10 +74,6 @@ class TaskTestCase(unittest.TestCase): new={'NODE_NAME': 'huawei-pod1', 'INSTALLER_TYPE': 'compass'}): task_files, task_args, task_args_fnames = t.parse_suite() - self.assertEqual(task_files[0], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc001.yaml')) - self.assertEqual(task_files[1], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc002.yaml')) self.assertIsNone(task_args[0]) self.assertIsNone(task_args[1]) self.assertIsNone(task_args_fnames[0]) @@ -90,10 +86,6 @@ class TaskTestCase(unittest.TestCase): new={'NODE_NAME': 'huawei-pod1', 'INSTALLER_TYPE': 'compass'}): task_files, task_args, task_args_fnames = t.parse_suite() - self.assertEqual(task_files[0], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc001.yaml')) - self.assertEqual(task_files[1], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc002.yaml')) self.assertIsNone(task_args[0]) self.assertEqual(task_args[1], '{"host": "node1.LF","target": "node2.LF"}') @@ -106,10 +98,7 @@ class TaskTestCase(unittest.TestCase): with mock.patch.object(os, 'environ', new={'NODE_NAME': 'huawei-pod1', 'INSTALLER_TYPE': 'compass'}): task_files, task_args, task_args_fnames = t.parse_suite() - self.assertEqual(task_files[0], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc001.yaml')) - self.assertEqual(task_files[1], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc002.yaml')) + self.assertIsNone(task_args[0]) self.assertIsNone(task_args[1]) self.assertIsNone(task_args_fnames[0]) @@ -122,10 +111,6 @@ class TaskTestCase(unittest.TestCase): new={'NODE_NAME': 'huawei-pod1', 'INSTALLER_TYPE': 'compass'}): task_files, task_args, task_args_fnames = t.parse_suite() - self.assertEqual(task_files[0], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc001.yaml')) - self.assertEqual(task_files[1], self.change_to_abspath( - 'tests/onap/test_cases/onap_vnftest_tc002.yaml')) self.assertIsNone(task_args[0]) self.assertEqual(task_args[1], '{"host": "node1.LF","target": "node2.LF"}') -- cgit 1.2.3-korg