diff --git a/src/fromager/packagesettings/_resolver.py b/src/fromager/packagesettings/_resolver.py index 6a05a5d8..3d2f4e40 100644 --- a/src/fromager/packagesettings/_resolver.py +++ b/src/fromager/packagesettings/_resolver.py @@ -603,7 +603,7 @@ def _gitlab_provider( raise ValueError(f"Empty path in {self.project_url}") return resolver.GitLabTagProvider( project_path=self.project_url.path.lstrip("/"), - server_url=f"https://{self.project_url.host}:{self.project_url.port}", + server_url=f"https://{self.project_url.host}:{self.project_url.port or 443}", constraints=ctx.constraints, matcher=self._get_matcher(ctx), req_type=req_type, diff --git a/tests/conftest.py b/tests/conftest.py index 152865ef..77b610e7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -124,6 +124,20 @@ def testdata_context( return ctx +def _configure_package(ctx: context.WorkContext, yaml_str: str) -> None: + """Apply one package setting to the test context.""" + ps = packagesettings.PackageSettings.from_string("pkg", yaml_str) + ctx.settings._package_settings[ps.name] = ps + + +def _source_yaml(provider: str) -> str: + """Return package settings that select a configured source provider.""" + yaml_str = f"source:\n provider: {provider}\n" + if provider == "hook-prebuilt": + yaml_str += " index_url: https://index.test/simple\n" + return yaml_str + + def make_sbom_ctx( tmp_path: pathlib.Path, sbom_settings: SbomSettings | None = None, diff --git a/tests/test_bootstrapper.py b/tests/test_bootstrapper.py index d67cc9b4..6ef06491 100644 --- a/tests/test_bootstrapper.py +++ b/tests/test_bootstrapper.py @@ -8,6 +8,7 @@ import pytest import requests.exceptions +from conftest import _configure_package, _source_yaml from packaging.requirements import Requirement from packaging.utils import canonicalize_name from packaging.version import Version @@ -48,20 +49,6 @@ from fromager.requirements_file import RequirementType, SourceType -def _configure_package(ctx: WorkContext, yaml_str: str) -> None: - """Apply one package setting to the test context.""" - ps = PackageSettings.from_string("pkg", yaml_str) - ctx.settings._package_settings[ps.name] = ps - - -def _source_yaml(provider: str) -> str: - """Return package settings that select a configured source provider.""" - yaml_str = f"source:\n provider: {provider}\n" - if provider == "hook-prebuilt": - yaml_str += " index_url: https://index.test/simple\n" - return yaml_str - - def test_phase_subclass_without_phase_attribute_raises() -> None: """Concrete Phase subclass missing 'phase' raises TypeError at class definition.""" with pytest.raises(TypeError, match="must define the 'phase' class attribute"): diff --git a/tests/test_commands.py b/tests/test_commands.py index bb1113bb..525096b8 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -11,6 +11,7 @@ import pytest import requests_mock from click.testing import CliRunner +from conftest import _configure_package, _source_yaml from packaging.requirements import Requirement from packaging.version import Version @@ -20,20 +21,6 @@ from fromager.log import requirement_ctxvar -def _configure_package(ctx: WorkContext, yaml_str: str) -> None: - """Apply one package setting to the test context.""" - ps = packagesettings.PackageSettings.from_string("pkg", yaml_str) - ctx.settings._package_settings[ps.name] = ps - - -def _source_yaml(provider: str) -> str: - """Return package settings that select a configured source provider.""" - yaml_str = f"source:\n provider: {provider}\n" - if provider == "hook-prebuilt": - yaml_str += " index_url: https://index.test/simple\n" - return yaml_str - - @pytest.mark.parametrize("provider", ["pypi-prebuilt", "hook-prebuilt"]) def test_build_order_replay_uses_configured_download( tmp_context: WorkContext, provider: str diff --git a/tests/test_list_versions.py b/tests/test_list_versions.py index 3f665419..f35a7d95 100644 --- a/tests/test_list_versions.py +++ b/tests/test_list_versions.py @@ -502,6 +502,34 @@ def test_list_versions_source_min_release_age( assert status_by_version["1.3.2"] == "available" +def test_list_versions_source_inherits_global_min_release_age( + cli_runner: CliRunner, + tmp_path: pathlib.Path, + monkeypatch: pytest.MonkeyPatch, +) -> None: + """A source config without min_release_age inherits the global cooldown.""" + _freeze_cooldown_bootstrap_time(monkeypatch) + + settings_dir = tmp_path / "settings" + _write_source_settings(settings_dir) + + # No source override, so the global value (3 days) applies: 2.0.0 is + # 2 days old and blocked, while 1.3.2 is 11 days old and available. + result = _invoke_with_source_settings( + cli_runner, + settings_dir, + extra_args=["--format", "json"], + min_release_age=3, + ) + assert result.exit_code == 0 + status_by_version = { + row["version"]: row["cooldown"] + for row in json.loads(_extract_json_from_output(result.stdout)) + } + assert status_by_version["2.0.0"] == "blocked" + assert status_by_version["1.3.2"] == "available" + + def test_list_versions_source_min_release_age_zero( cli_runner: CliRunner, tmp_path: pathlib.Path, diff --git a/tests/test_packagesettings_resolver.py b/tests/test_packagesettings_resolver.py index 5f05ec12..4e3d5589 100644 --- a/tests/test_packagesettings_resolver.py +++ b/tests/test_packagesettings_resolver.py @@ -764,7 +764,7 @@ def test_resolver_provider(self, tmp_context: WorkContext) -> None: p = r.resolver_provider(tmp_context, _REQ, _REQ_TYPE) assert isinstance(p, resolver.GitLabTagProvider) assert p.project_path == "python-wheel-build/fromager" - assert "gitlab.test" in p.server_url + assert p.server_url == "https://gitlab.test:443" assert p.override_download_url is None @mock.patch("fromager.downloads.download_url") @@ -807,7 +807,7 @@ def test_resolver_provider(self, tmp_context: WorkContext) -> None: p = r.resolver_provider(tmp_context, _REQ, _REQ_TYPE) assert isinstance(p, resolver.GitLabTagProvider) assert p.project_path == "python-wheel-build/fromager" - assert "gitlab.test" in p.server_url + assert p.server_url == "https://gitlab.test:443" assert p.override_download_url == ( "git+https://gitlab.test/python-wheel-build/fromager@{tagname}" ) diff --git a/tests/test_wheels.py b/tests/test_wheels.py index f9fd22f0..0a693d68 100644 --- a/tests/test_wheels.py +++ b/tests/test_wheels.py @@ -6,7 +6,7 @@ from unittest.mock import Mock, patch import pytest -from conftest import make_sbom_ctx +from conftest import _configure_package, _source_yaml, make_sbom_ctx from packaging.requirements import Requirement from packaging.tags import Tag from packaging.version import Version @@ -22,20 +22,6 @@ from fromager.packagesettings import SbomSettings, Settings, SettingsFile, WheelSettings -def _configure_package(ctx: context.WorkContext, yaml_str: str) -> None: - """Apply one package setting to the test context.""" - ps = packagesettings.PackageSettings.from_string("pkg", yaml_str) - ctx.settings._package_settings[ps.name] = ps - - -def _source_yaml(provider: str) -> str: - """Return package settings that select a configured source provider.""" - yaml_str = f"source:\n provider: {provider}\n" - if provider == "hook-prebuilt": - yaml_str += " index_url: https://index.test/simple\n" - return yaml_str - - @pytest.mark.parametrize("provider", ["pypi-prebuilt", "hook-prebuilt"]) def test_configured_prebuilt_download_uses_resolver_default( tmp_context: context.WorkContext, provider: str