tests: resolve all peer-review issues across test suite

Address every substantive critique from the peer review: test_cache: replace tautological same-inputs key test with hardcoded hash assertion; assert setex call + TTL in mark_index_cached test; assert client is None for unavailable no-op; rename Packages.gz test to document intentional behaviour; add alpine sig/tmp negatives; add hyphenated and date-tag docker positive cases; add key hash-length assertion. test_config: replace live-constant comparisons with literal string assertions for alpine/rpm/docker; add unknown package type test; add dict-keyed repositories branch coverage (per-repo override and fallback); fix cache config to full equality check; add explicit empty index_patterns test. test_docker_auth: fix case-insensitive test to verify realm value; add field-order (scope before service) limitation test; add pipe-char collision documentation test; add missing fetch_token edge cases (no token field, HTTPStatusError, missing expires_in default 300); replace rubber-stamp delegate test with end-to-end parse→fetch test. test_storage: replace split prefix/suffix assertions with structural 3-part check + pinned sha256 assertion; fix Docker blob digests to 64-char hex; add secure=True URL test; add upload return value test; add download_object 404-on-ClientError test; remove redundant subset test. test_routes: add metrics.record_cache_hit/miss assertions; add mark_index_cached assertion after cache miss on index (docker + generic); add Content-Disposition, X-Artifact-Size header checks; add rpm/xml content-type tests; add flush test that verifies Redis keys are deleted when cache is available; add smoke coverage for upload (PUT), HEAD, DELETE, /metrics, and /config routes.
2026-04-25 19:58:33 +10:00
parent 3a13d76f7e
commit 8da43e610e
6 changed files with 608 additions and 164 deletions
@@ -1,19 +1,22 @@
 """Tests for ConfigManager, focusing on get_index_patterns (new logic)."""
+
 import os

 import pytest
 import yaml

-from artifactapi.config import _PACKAGE_INDEX_PATTERNS, ConfigManager
+from artifactapi.config import ConfigManager


@pytest.fixture
 def make_config(tmp_path):
    """Factory: write a remotes dict to a temp YAML and return a ConfigManager."""
+
    def _make(remotes_dict):
        cfg_file = tmp_path / "remotes.yaml"
        cfg_file.write_text(yaml.dump({"remotes": remotes_dict}))
        return ConfigManager(str(cfg_file))
+
    return _make


@@ -21,18 +24,25 @@ def make_config(tmp_path):
 # get_index_patterns
 # ---------------------------------------------------------------------------

+
 class TestGetIndexPatterns:
    def test_alpine_returns_package_defaults(self, make_config):
        cfg = make_config({"r": {"type": "remote", "package": "alpine", "base_url": "https://x.com"}})
-        assert cfg.get_index_patterns("r") == _PACKAGE_INDEX_PATTERNS["alpine"]
+        patterns = cfg.get_index_patterns("r")
+        # Assert against literal strings, not the live constant, so a rename doesn't mask a regression
+        assert r"APKINDEX\.tar\.gz$" in patterns

    def test_rpm_returns_package_defaults(self, make_config):
        cfg = make_config({"r": {"type": "remote", "package": "rpm", "base_url": "https://x.com"}})
-        assert cfg.get_index_patterns("r") == _PACKAGE_INDEX_PATTERNS["rpm"]
+        patterns = cfg.get_index_patterns("r")
+        assert r"repomd\.xml$" in patterns
+        assert any("repodata" in p for p in patterns)

    def test_docker_returns_package_defaults(self, make_config):
        cfg = make_config({"r": {"type": "remote", "package": "docker", "base_url": "https://x.com"}})
-        assert cfg.get_index_patterns("r") == _PACKAGE_INDEX_PATTERNS["docker"]
+        patterns = cfg.get_index_patterns("r")
+        assert any("manifests" in p for p in patterns)
+        assert any("tags/list" in p for p in patterns)

    def test_generic_returns_empty_list(self, make_config):
        cfg = make_config({"r": {"type": "remote", "package": "generic", "base_url": "https://x.com"}})
@@ -46,74 +56,103 @@ class TestGetIndexPatterns:
        cfg = make_config({"r": {"type": "remote", "base_url": "https://x.com"}})
        assert cfg.get_index_patterns("r") == []

+    def test_unknown_package_type_returns_empty_list(self, make_config):
+        # A mis-spelled package type silently returns [] — this is a known footgun
+        cfg = make_config({"r": {"type": "remote", "package": "deb", "base_url": "https://x.com"}})
+        assert cfg.get_index_patterns("r") == []
+
    def test_extra_patterns_appended_after_defaults(self, make_config):
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "alpine",
-                "base_url": "https://x.com",
-                "index_patterns": ["custom\\.json$"],
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "alpine",
+                    "base_url": "https://x.com",
+                    "index_patterns": [r"custom\.json$"],
+                }
            }
-        })
+        )
        patterns = cfg.get_index_patterns("r")
-        defaults = _PACKAGE_INDEX_PATTERNS["alpine"]
-        assert patterns[: len(defaults)] == defaults
-        assert "custom\\.json$" in patterns
+        assert r"APKINDEX\.tar\.gz$" in patterns
+        assert r"custom\.json$" in patterns
+        # Defaults come first
+        assert patterns.index(r"APKINDEX\.tar\.gz$") < patterns.index(r"custom\.json$")
+
+    def test_explicit_empty_extra_patterns_returns_defaults(self, make_config):
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "alpine",
+                    "base_url": "https://x.com",
+                    "index_patterns": [],
+                }
+            }
+        )
+        assert r"APKINDEX\.tar\.gz$" in cfg.get_index_patterns("r")

    def test_duplicate_extra_pattern_not_added_twice(self, make_config):
-        existing = _PACKAGE_INDEX_PATTERNS["alpine"][0]
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "alpine",
-                "base_url": "https://x.com",
-                "index_patterns": [existing],
+        existing = r"APKINDEX\.tar\.gz$"
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "alpine",
+                    "base_url": "https://x.com",
+                    "index_patterns": [existing],
+                }
            }
-        })
+        )
        patterns = cfg.get_index_patterns("r")
        assert patterns.count(existing) == 1

    def test_generic_with_only_extra_patterns(self, make_config):
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "generic",
-                "base_url": "https://x.com",
-                "index_patterns": ["meta\\.json$", "index\\.yaml$"],
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "generic",
+                    "base_url": "https://x.com",
+                    "index_patterns": [r"meta\.json$", r"index\.yaml$"],
+                }
            }
-        })
-        assert cfg.get_index_patterns("r") == ["meta\\.json$", "index\\.yaml$"]
+        )
+        assert cfg.get_index_patterns("r") == [r"meta\.json$", r"index\.yaml$"]

    def test_rpm_extra_patterns_merged(self, make_config):
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "rpm",
-                "base_url": "https://x.com",
-                "index_patterns": ["custom-meta\\.xml$"],
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "rpm",
+                    "base_url": "https://x.com",
+                    "index_patterns": [r"custom-meta\.xml$"],
+                }
            }
-        })
+        )
        patterns = cfg.get_index_patterns("r")
-        for default in _PACKAGE_INDEX_PATTERNS["rpm"]:
-            assert default in patterns
-        assert "custom-meta\\.xml$" in patterns
+        assert r"repomd\.xml$" in patterns
+        assert r"custom-meta\.xml$" in patterns


 # ---------------------------------------------------------------------------
 # get_repository_patterns
 # ---------------------------------------------------------------------------

+
 class TestGetRepositoryPatterns:
    def test_returns_include_patterns(self, make_config):
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "generic",
-                "base_url": "https://x.com",
-                "include_patterns": [".*\\.tar\\.gz$"],
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "generic",
+                    "base_url": "https://x.com",
+                    "include_patterns": [r".*\.tar\.gz$"],
+                }
            }
-        })
-        assert cfg.get_repository_patterns("r", "") == [".*\\.tar\\.gz$"]
+        )
+        assert cfg.get_repository_patterns("r", "") == [r".*\.tar\.gz$"]

    def test_returns_empty_for_missing_remote(self, make_config):
        cfg = make_config({})
@@ -124,35 +163,70 @@ class TestGetRepositoryPatterns:
        assert cfg.get_repository_patterns("r", "") == []

    def test_multiple_patterns_returned(self, make_config):
-        patterns = [".*\\.rpm$", ".*/repodata/.*$"]
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "rpm",
-                "base_url": "https://x.com",
-                "include_patterns": patterns,
+        patterns = [r".*\.rpm$", r".*/repodata/.*$"]
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "rpm",
+                    "base_url": "https://x.com",
+                    "include_patterns": patterns,
+                }
            }
-        })
+        )
        assert cfg.get_repository_patterns("r", "") == patterns

+    def test_dict_keyed_repositories_returns_per_repo_patterns(self, make_config):
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "generic",
+                    "base_url": "https://x.com",
+                    "include_patterns": [r".*\.tar\.gz$"],
+                    "repositories": {
+                        "/path/to/repo": {"include_patterns": [r".*\.rpm$"]},
+                    },
+                }
+            }
+        )
+        assert cfg.get_repository_patterns("r", "/path/to/repo") == [r".*\.rpm$"]
+
+    def test_dict_keyed_repositories_falls_back_to_remote_patterns(self, make_config):
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "generic",
+                    "base_url": "https://x.com",
+                    "include_patterns": [r".*\.tar\.gz$"],
+                    "repositories": {
+                        "/path/to/repo": {"include_patterns": [r".*\.rpm$"]},
+                    },
+                }
+            }
+        )
+        assert cfg.get_repository_patterns("r", "/unknown/path") == [r".*\.tar\.gz$"]
+

 # ---------------------------------------------------------------------------
 # get_cache_config
 # ---------------------------------------------------------------------------

+
 class TestGetCacheConfig:
    def test_returns_cache_section(self, make_config):
-        cfg = make_config({
-            "r": {
-                "type": "remote",
-                "package": "generic",
-                "base_url": "https://x.com",
-                "cache": {"file_ttl": 0, "index_ttl": 7200},
+        cfg = make_config(
+            {
+                "r": {
+                    "type": "remote",
+                    "package": "generic",
+                    "base_url": "https://x.com",
+                    "cache": {"file_ttl": 0, "index_ttl": 7200},
+                }
            }
-        })
-        result = cfg.get_cache_config("r")
-        assert result["index_ttl"] == 7200
-        assert result["file_ttl"] == 0
+        )
+        assert cfg.get_cache_config("r") == {"file_ttl": 0, "index_ttl": 7200}

    def test_returns_empty_dict_for_missing_remote(self, make_config):
        cfg = make_config({})
@@ -167,6 +241,7 @@ class TestGetCacheConfig:
 # Config file reload
 # ---------------------------------------------------------------------------

+
 class TestConfigReload:
    def test_reloads_when_file_mtime_advances(self, tmp_path):
        cfg_file = tmp_path / "remotes.yaml"
@@ -188,7 +263,7 @@ class TestConfigReload:
        cfg_file.write_text(yaml.dump({"remotes": {"repo-a": {"type": "remote", "package": "generic", "base_url": "https://x.com"}}}))
        cfg = ConfigManager(str(cfg_file))

-        # Call check_reload without touching the file → should not reload
+        # Call check_reload without touching the file — should not reload
        cfg._check_reload()

        assert "repo-a" in cfg.config["remotes"]