From 1ce17fab54ce904f88d8fde1faaba14352688ae0 Mon Sep 17 00:00:00 2001 From: KB-perByte Date: Sat, 9 Apr 2022 11:28:35 +0530 Subject: [PATCH] update tests --- plugins/filter/consolidate.py | 4 ++++ plugins/plugin_utils/consolidate.py | 6 +++--- tests/unit/plugins/filter/test_consolidate.py | 15 ++++++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/plugins/filter/consolidate.py b/plugins/filter/consolidate.py index cb6f8e8..bd1ee83 100644 --- a/plugins/filter/consolidate.py +++ b/plugins/filter/consolidate.py @@ -1216,6 +1216,10 @@ from ansible_collections.ansible.utils.plugins.module_utils.common.argspec_valid AnsibleArgSpecValidator, ) +# import debugpy + +# debugpy.listen(3000) +# debugpy.wait_for_client() try: from jinja2.filters import pass_environment except ImportError: diff --git a/plugins/plugin_utils/consolidate.py b/plugins/plugin_utils/consolidate.py index e77de83..ceacca1 100644 --- a/plugins/plugin_utils/consolidate.py +++ b/plugins/plugin_utils/consolidate.py @@ -160,9 +160,9 @@ def consolidate_facts(data_sources, all_values): def consolidate( data_sources, - fail_missing_match_key=False, - fail_missing_match_value=False, - fail_duplicate=False, + fail_missing_match_key, + fail_missing_match_value, + fail_duplicate, ): """Calls data validation and consolidation functions diff --git a/tests/unit/plugins/filter/test_consolidate.py b/tests/unit/plugins/filter/test_consolidate.py index 876d0ea..222e729 100644 --- a/tests/unit/plugins/filter/test_consolidate.py +++ b/tests/unit/plugins/filter/test_consolidate.py @@ -244,7 +244,16 @@ class TestConsolidate(unittest.TestCase): "l3_interfaces": {"name": "Loopback999"}, }, } - args = ["", data_sources] + fail_missing_match_value = False + fail_missing_match_key = False + fail_duplicate = False + args = [ + "", + data_sources, + fail_missing_match_key, + fail_missing_match_value, + fail_duplicate, + ] result = _consolidate(*args) self.assertEqual(result, output) @@ -366,7 +375,7 @@ class TestConsolidate(unittest.TestCase): ] fail_missing_match_key = True - args = ["", data_sources, fail_missing_match_key] + args = ["", data_sources, fail_missing_match_key, False, False] with self.assertRaises(AnsibleFilterError) as error: _consolidate(*args) self.assertIn( @@ -374,7 +383,7 @@ class TestConsolidate(unittest.TestCase): str(error.exception), ) - def test_fail_missing_match_value(self): + def test_fail_duplicate(self): data_sources = [ { "data": [