diff options
Diffstat (limited to 'vnftest/tests/unit/core')
| -rw-r--r-- | vnftest/tests/unit/core/no_constraint_with_args_step_sample.yaml | 5 | ||||
| -rw-r--r-- | vnftest/tests/unit/core/test_task.py | 17 |
2 files changed, 3 insertions, 19 deletions
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"}') |