Lint: Fix type annotations in tests

Author: ByteOtter

tests/apt/test_package_repo_info.py

@@ -1,17 +1,16 @@
 from types import SimpleNamespace
-from typing import List
+from typing import List, Tuple
 
 import pytest
-from apt_repo import BinaryPackage
 
 import gardenlinux.apt.package_repo_info as repoinfo
 
 
 class FakeAPTRepo:
     """
-    Fake replacement for apt_repo.APTTRepository.
+    Fake replacement for apt_repo.APTRepository.
 
-    - stores the contructor args for assertions
+    - stores the constructor args for assertions
     - exposes `.packages` and `get_packages_by_name(name)`
     """
 
@@ -20,12 +19,22 @@ def __init__(self, url: str, dist: str, components: List[str]) -> None:
         self.dist = dist
         self.components = components
         # list of objects with .package and .version attributes
-        self.packages: List[BinaryPackage] = []
+        self.packages: List[SimpleNamespace] = []
 
-    def get_packages_by_name(self, name: str) -> BinaryPackage:
+    def get_packages_by_name(self, name: str) -> List[SimpleNamespace]:
         return [p for p in self.packages if p.package == name]
 
 
+# Fake GardenLinuxRepo subclass to avoid incomplete type issues in compare tests
+class FakeRepo(repoinfo.GardenLinuxRepo):
+    def __init__(self, versions: List[Tuple[str, str]]) -> None:
+        # Skip calling the real constructor
+        self._versions = versions
+
+    def get_packages_versions(self) -> List[Tuple[str, str]]:
+        return self._versions
+
+
 def test_gardenlinuxrepo_init(monkeypatch: pytest.MonkeyPatch) -> None:
     """
     Test if GardenLinuxRepo creates an internal APTRepo
@@ -91,11 +100,11 @@ def test_compare_repo_union_returns_all() -> None:
     - names in both but with different versions
     """
     # Arrange
-    a = SimpleNamespace(get_packages_versions=lambda: [("a", "1"), ("b", "2")])
-    b = SimpleNamespace(get_packages_versions=lambda: [("b", "3"), ("c", "4")])
+    a = FakeRepo([("a", "1"), ("b", "2")])
+    b = FakeRepo([("b", "3"), ("c", "4")])
 
     # Act
-    result = repoinfo.compare_repo(a, b, available_in_both=False)  # type: ignore
+    result = repoinfo.compare_repo(a, b, available_in_both=False)
 
     # Assert
     expected = {
@@ -111,12 +120,12 @@ def test_compare_repo_intersection_only() -> None:
     When available_in_both=True, only intersection names are considered;
     differences are only returned if versions differ.
     """
-    # Arrange (both share 'b' with different versions)
-    a = SimpleNamespace(get_packages_versions=lambda: [("a", "1"), ("b", "2")])
-    b = SimpleNamespace(get_packages_versions=lambda: [("b", "3"), ("c", "4")])
+    # Arrange
+    a = FakeRepo([("a", "1"), ("b", "2")])
+    b = FakeRepo([("b", "3"), ("c", "4")])
 
     # Act
-    result = repoinfo.compare_repo(a, b, available_in_both=True)  # type: ignore
+    result = repoinfo.compare_repo(a, b, available_in_both=True)
 
     # Assert
     assert set(result) == {("b", "2", "3")}
@@ -127,20 +136,20 @@ def test_compare_same_returns_empty() -> None:
     When both sets are identical, compare_repo should return an empty set.
     """
     # Arrange
-    a = SimpleNamespace(get_packages_versions=lambda: [("a", "1"), ("b", "2")])
-    b = SimpleNamespace(get_packages_versions=lambda: [("a", "1"), ("b", "2")])
+    a = FakeRepo([("a", "1"), ("b", "2")])
+    b = FakeRepo([("a", "1"), ("b", "2")])
 
     # Act / Assert
-    assert repoinfo.compare_repo(a, b, available_in_both=False) == []  # type: ignore
+    assert repoinfo.compare_repo(a, b, available_in_both=False) == []
 
 
 def test_compare_empty_returns_empty() -> None:
     """
     If both sets are empty, compare_repo should return an empty set.
     """
     # Arrange
-    a = SimpleNamespace(get_packages_versions=lambda: [])
-    b = SimpleNamespace(get_packages_versions=lambda: [])
+    a = FakeRepo([])
+    b = FakeRepo([])
 
     # Act / Assert
-    assert repoinfo.compare_repo(a, b, available_in_both=True) == []  # type: ignore
+    assert repoinfo.compare_repo(a, b, available_in_both=True) == []

tests/conftest.py

@@ -129,7 +129,7 @@ def write_zot_config(config_dict: Dict[str, Any], fd: int) -> None:
         json.dump(config_dict, fp, indent=4)
 
 
-@pytest.fixture(autouse=False, scope="function")  # type: ignore[misc]
+@pytest.fixture(autouse=False, scope="function")
 def zot_session() -> Generator[subprocess.Popen[Any]]:
     load_dotenv()
     print("start zot session")

tests/distro_version/test_distro_version.py

@@ -9,39 +9,39 @@
 )
 
 
-def test_distro_version_unrecognizable_non_numeric_version():
+def test_distro_version_unrecognizable_non_numeric_version() -> None:
     with pytest.raises(UnsupportedDistroVersion):
         DistroVersion("garden.linux")
 
 
-def test_distro_version_unrecognizable_numeric_version():
+def test_distro_version_unrecognizable_numeric_version() -> None:
     with pytest.raises(UnsupportedDistroVersion):
         DistroVersion("1.2.3.4")
     with pytest.raises(UnsupportedDistroVersion):
         DistroVersion("1.100.-10")
 
 
-def test_distro_version_unrecognizable_too_short_version():
+def test_distro_version_unrecognizable_too_short_version() -> None:
     with pytest.raises(UnsupportedDistroVersion):
         DistroVersion("1")
 
 
-def test_distro_version_legacy_version_is_parsable():
+def test_distro_version_legacy_version_is_parsable() -> None:
     assert isinstance(DistroVersion("1.2"), LegacyDistroVersion)
 
 
-def test_distro_version_semver_version_is_parsable():
+def test_distro_version_semver_version_is_parsable() -> None:
     assert isinstance(DistroVersion("1.2.3"), SemverDistroVersion)
 
 
-def test_distro_version_patch_release_is_recognized():
+def test_distro_version_patch_release_is_recognized() -> None:
     assert DistroVersion("1.1").is_patch_release()
     assert DistroVersion("1.1.100").is_patch_release()
     assert not DistroVersion("1.0").is_patch_release()
     assert not DistroVersion("1.0.0").is_patch_release()
 
 
-def test_distro_version_previous_patch_release_is_recognized():
+def test_distro_version_previous_patch_release_is_recognized() -> None:
     assert DistroVersion("1.1").previous_patch_release().__str__() == "1.0"
     assert DistroVersion("1.1.100").previous_patch_release().__str__() == "1.1.99"
     with pytest.raises(NotAPatchRelease):

tests/features/test_cname.py

@@ -3,7 +3,7 @@
 from gardenlinux.features import CName
 
 
-@pytest.mark.parametrize(  # type: ignore[misc]
+@pytest.mark.parametrize(
     "input_cname, expected_output",
     [
         (

tests/features/test_cname_main.py

@@ -11,7 +11,7 @@
 
 
 def test_main_happy(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     """
     Test the "Happy Path" of the main() function.
@@ -49,7 +49,7 @@ def sort_graph_nodes(graph: networkx.Graph) -> List[str]:
 
 
 def test_main_version_from_file(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     """
     "Happy Path" test for grabbing the version and commit id from file in main().

tests/features/test_main.py

@@ -88,7 +88,7 @@ def test_get_version_missing_file_raises(tmp_path: Path) -> None:
 # Tests for main()
 # -------------------------------
 def test_main_prints_arch(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = ["prog", "--arch", "amd64", "--cname", "flav", "--version", "1.0", "arch"]
@@ -104,7 +104,7 @@ def test_main_prints_arch(
 
 
 def test_main_prints_container_name(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = [
@@ -129,7 +129,7 @@ def test_main_prints_container_name(
 
 
 def test_main_prints_container_tag(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = [
@@ -156,7 +156,7 @@ def test_main_prints_container_tag(
 
 
 def test_main_prints_commit_id(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = ["prog", "--arch", "amd64", "--cname", "flav", "commit_id"]
@@ -179,7 +179,7 @@ def test_main_prints_commit_id(
 
 
 def test_main_prints_flags_elements_platforms(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = [
@@ -210,7 +210,7 @@ def __init__(self, *a: Any, **k: Any):
 
 
 def test_main_prints_version(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = ["prog", "--arch", "amd64", "--cname", "flav", "version"]
@@ -233,7 +233,7 @@ def test_main_prints_version(
 
 
 def test_main_prints_version_and_commit_id(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = ["prog", "--arch", "amd64", "--cname", "flav", "version_and_commit_id"]
@@ -297,7 +297,7 @@ def test_main_raises_no_arch_no_default(monkeypatch: pytest.MonkeyPatch) -> None
 
 
 def test_main_raises_missing_commit_id(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     argv = [
@@ -319,7 +319,7 @@ def test_main_raises_missing_commit_id(
 
 
 def test_main_with_exclude_cname_print_elements(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     monkeypatch.setattr(
@@ -353,7 +353,7 @@ def test_main_with_exclude_cname_print_elements(
 
 
 def test_main_with_exclude_cname_print_features(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     # Arrange
     monkeypatch.setattr(
@@ -390,7 +390,7 @@ def test_main_with_exclude_cname_print_features(
 
 
 def test_cname_release_file(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     """
     Test validation between release metadata and arguments given

tests/features/test_metadata_main.py

@@ -10,7 +10,7 @@
 
 
 def test_main_output(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     """
     Test successful "output-release-metadata"
@@ -37,7 +37,7 @@ def test_main_output(
 
 
 def test_main_write(
-    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture
+    monkeypatch: pytest.MonkeyPatch, capsys: pytest.CaptureFixture[str]
 ) -> None:
     """
     Test successful "write"

tests/features/test_parser.py

@@ -7,7 +7,7 @@
 from ..constants import GL_ROOT_DIR
 
 
-@pytest.mark.parametrize(  # type: ignore[misc]
+@pytest.mark.parametrize(
     "input_cname, expected_output",
     [
         (

tests/flavors/test_parser.py

@@ -6,7 +6,7 @@
 from gardenlinux.flavors.parser import Parser
 
 
-@pytest.fixture  # type: ignore[misc]
+@pytest.fixture
 def valid_data() -> Dict[str, Any]:
     """Minimal data for valid GL_FLAVORS_SCHEMA."""
     return {
@@ -97,7 +97,7 @@ def test_filter_category_and_exclude(valid_data: str) -> None:
     assert all("android" in name for _, name in android_combos)
 
 
-@pytest.mark.parametrize("flag", ["only_build", "only_test", "only_publish"])  # type: ignore[misc]
+@pytest.mark.parametrize("flag", ["only_build", "only_test", "only_publish"])
 def test_filter_with_flags(valid_data: str, flag: str) -> None:
     # Arrange
     parser = make_parser(valid_data)