Update tests

Signed-off-by: paulober <[email protected]>

Author: paulober

cloudinit/distros/debian.py

@@ -87,7 +87,7 @@ def apply_locale(self, locale, out_fn=None, keyname="LANG"):
 
         if not locale:
             raise ValueError("Failed to provide locale value.")
-        
+
         # Make sure it has a charset for system commands to work
         locale = _normalize_locale(locale)
 
@@ -302,7 +302,9 @@ def _normalize_locale(requested: str) -> str:
 
     # Accept canonical “no-regeneration” values as-is
     if req.lower() in ("c", "posix", "c.utf-8", "c.utf8"):
-        return "C.UTF-8" if req.lower() != "c" and "utf" in req.lower() else "C"
+        return (
+            "C.UTF-8" if req.lower() != "c" and "utf" in req.lower() else "C"
+        )
 
     # If no charset specified, default to UTF-8
     if "." not in req and "@" not in req:

tests/unittests/config/test_cc_locale.py

@@ -1,6 +1,8 @@
 # Copyright (C) 2013 Hewlett-Packard Development Company, L.P.
+# Copyright (C) 2025 Raspberry Pi Ltd.
 #
 # Author: Juerg Haefliger <[email protected]>
+# Author: Paul Oberosler <[email protected]>
 #
 # This file is part of cloud-init. See LICENSE file for license information.
 import logging
@@ -48,7 +50,13 @@ def test_set_locale_arch(self):
                 contents = util.load_text_file(cc.distro.locale_gen_fn)
                 assert "%s UTF-8" % locale in contents
                 m_subp.assert_called_with(
-                    ["localectl", "set-locale", locale], capture=False
+                    ["localectl", "set-locale", locale],
+                    update_env={
+                        "LANG": "C.UTF-8",
+                        "LANGUAGE": "C.UTF-8",
+                        "LC_ALL": "C.UTF-8",
+                    },
+                    capture=False,
                 )
 
     @pytest.mark.parametrize(
@@ -122,6 +130,11 @@ def test_locale_update_config_if_different_than_default(self, tmpdir):
                 "--locale-file=%s" % locale_conf.strpath,
                 "LANG=C.UTF-8",
             ],
+            update_env={
+                "LANG": "C.UTF-8",
+                "LANGUAGE": "C.UTF-8",
+                "LC_ALL": "C.UTF-8",
+            },
             capture=False,
         )
         m_which.assert_called_once_with("update-locale")