From 5b92e7db86b5ae0d1d0675630f0c486b800f4853 Mon Sep 17 00:00:00 2001
From: a-dubs <alec.warren@canonical.com>
Date: Fri, 1 Dec 2023 14:56:09 -0500
Subject: [PATCH] still fighting with unit tests

---
 tests/unittests/cmd/test_query.py     | 46 +++------------------------
 tests/unittests/config/test_schema.py |  4 +--
 2 files changed, 6 insertions(+), 44 deletions(-)

diff --git a/tests/unittests/cmd/test_query.py b/tests/unittests/cmd/test_query.py
index c85c5d625d8b..124f95940bad 100644
--- a/tests/unittests/cmd/test_query.py
+++ b/tests/unittests/cmd/test_query.py
@@ -33,7 +33,6 @@ def _gzip_data(data):
 def setup_mocks(mocker):
     mocker.patch("cloudinit.cmd.query.read_cfg_paths", return_value=Paths({}))
 
-
 class TestQuery:
     Args = namedtuple(
         "Args",
@@ -84,10 +83,7 @@ def test_handle_args_error_on_missing_param(self, caplog, capsys):
             vendor_data=None,
             varname=None,
         )
-        with mock.patch(
-            M_PATH + "add_log_handler_cli", return_value=""
-        ) as m_cli_log:
-            assert 1 == query.handle_args("anyname", args)
+        assert 1 == query.handle_args("anyname", args)
         expected_error = (
             "Expected one of the options: --all, --format, --list-keys"
             " or varname\n"
@@ -130,10 +126,9 @@ def test_handle_args_error_on_invalid_varname_paths(
         paths, _, _, _ = self._setup_paths(tmpdir)
         with mock.patch(M_PATH + "read_cfg_paths") as m_paths:
             m_paths.return_value = paths
-            with mock.patch(M_PATH + "add_log_handler_cli", return_value=""):
-                with mock.patch(M_PATH + "load_userdata") as m_lud:
-                    m_lud.return_value = "ud"
-                    assert 1 == query.handle_args("anyname", args)
+            with mock.patch(M_PATH + "load_userdata") as m_lud:
+                m_lud.return_value = "ud"
+                assert 1 == query.handle_args("anyname", args)
         assert expected_error in caplog.text
 
     def test_handle_args_error_on_missing_instance_data(self, caplog, tmpdir):
@@ -638,36 +633,3 @@ def test_handle_args_invalid_jinja_exception(self, caplog, tmpdir, capsys):
         out, err = capsys.readouterr()
         assert expected_error in caplog.text
         assert expected_error in err
-        
-
-    # def test_handle_args_jinja_template_missing_header(self, caplog, tmpdir, capsys):
-    #     """Raise an error when --list-keys and varname specify a non-list."""
-    #     instance_data = tmpdir.join("instance-data")
-    #     instance_data.write(
-    #         '{"v1": {"v1_1": "val1.1", "v1_2": "val1.2"}, "v2": '
-    #         '{"v2_2": "val2.2"}, "top": "gun"}'
-    #     )
-    #     format = "v1_1: {{ v1.v1_1 }}"
-    #     expected_error = (
-    #         "Failed to render templated data. " + 
-    #         JinjaSyntaxParsingException.message_template.format(
-    #             syntax_error="unexpected '{'", 
-    #             line_no=2,
-    #             line_content="v1_1: {{ v1.v1_1 }}"
-    #         )
-    #     )
-    #     args = self.Args(
-    #         debug=False,
-    #         dump_all=False,
-    #         format=format,
-    #         instance_data=instance_data.strpath,
-    #         list_keys=False,
-    #         user_data="ud",
-    #         vendor_data="vd",
-    #         varname=None,
-    #     )
-    #     with mock.patch("os.getuid") as m_getuid:
-    #         m_getuid.return_value = 100
-    #         assert 1 == query.handle_args("anyname", args)
-    #     out, _err = capsys.readouterr()
-    #     assert expected_error == out
diff --git a/tests/unittests/config/test_schema.py b/tests/unittests/config/test_schema.py
index 3e0efeb31759..7ac85fbac777 100644
--- a/tests/unittests/config/test_schema.py
+++ b/tests/unittests/config/test_schema.py
@@ -852,12 +852,12 @@ def test_validateconfig_file_raises_enhanced_jinja_error(
         _out, err = capsys.readouterr()
         expected = (
             "Error:\n"
-            "Failed to render templated user-data: " + 
+            "Failed to render templated user-data. " + 
             JinjaSyntaxParsingException.message_template.format(
                 syntax_error="unexpected '}'", 
                 line_no=3,
                 line_content="c:{{ d } }",
-            )
+            ) + "\n"
         )
         assert expected == err