Various small fixes to utils tests

Signed-off-by: Samuel Monson <smonson@redhat.com>

Author: sjmonson

tests/unit/utils/test_auto_importer.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+import sys
 from unittest import mock
 
 import pytest
@@ -191,9 +192,9 @@ class TestClass(AutoImporterMixin):
             mock_import.assert_any_call("test.package.subpackage")
 
     @pytest.mark.sanity
-    @mock.patch("sys.modules", {"test.package.existing": mock.MagicMock()})
     @mock.patch("importlib.import_module")
     @mock.patch("pkgutil.walk_packages")
+    @mock.patch.dict(sys.modules, {"test.package.existing": mock.MagicMock()})
     def test_skip_already_imported_modules(self, mock_walk, mock_import):
         """Test that modules already in sys.modules are tracked but not re-imported."""
 

tests/unit/utils/test_registry.py

@@ -579,7 +579,9 @@ def validate_value(value: int) -> bool:
         if hasattr(inspect, "get_annotations"):
             # Python 3.10+
             try:
-                annotations = inspect.get_annotations(registered_class.__init__)
+                annotations = inspect.get_annotations(
+                    registered_class.__init__, eval_str=True
+                )
                 assert "value" in annotations
                 assert annotations["value"] is int
                 return_ann = annotations.get("return")

tests/unit/utils/test_text.py

@@ -42,7 +42,7 @@ class TestFormatValueDisplay:
             "expected",
         ),
         [
-            (42.0, "test", "", None, None, None, "42 [info]test[/info]"),
+            (42.0, "test", "", None, None, 0, "42 [info]test[/info]"),
             (42.5, "test", "ms", None, None, 1, "42.5ms [info]test[/info]"),
             (42.123, "test", "", None, 5, 2, " 42.12 [info]test[/info]"),
             (
@@ -78,34 +78,10 @@ def test_invocation(
         assert label in result
         assert units in result
         value_check = (
-            str(int(value))
-            if decimal_places == 0
-            else (
-                f"{value:.{decimal_places}f}"
-                if decimal_places is not None
-                else str(value)
-            )
+            str(int(value)) if decimal_places == 0 else f"{value:.{decimal_places}f}"
         )
         assert value_check in result or str(value) in result
 
-    @pytest.mark.sanity
-    @pytest.mark.parametrize(
-        ("value", "label"),
-        [
-            (None, "test"),
-            (42.0, None),
-            ("not_number", "test"),
-        ],
-    )
-    def test_invocation_with_none_values(self, value, label):
-        """Test format_value_display with None/invalid inputs still works."""
-        result = format_value_display(value, label)
-        assert isinstance(result, str)
-        if label is not None:
-            assert str(label) in result
-        if value is not None:
-            assert str(value) in result
-
 
 class TestSplitTextListByLength:
     """Test suite for split_text_list_by_length."""