From ce77be2fb546f5bd67cc438c7dece3b10b8da056 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Tue, 03 Mar 2026 00:09:03 +0000
Subject: [PATCH] Allow rebuilding existing repo packages
---
tests/test_resolver.py | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 107 insertions(+), 9 deletions(-)
diff --git a/tests/test_resolver.py b/tests/test_resolver.py
index 337e4ba..1d1a2af 100644
--- a/tests/test_resolver.py
+++ b/tests/test_resolver.py
@@ -119,20 +119,118 @@
assert len(cycles) > 0
@patch("archrepobuild.resolver.subprocess.run")
- def test_is_in_official_repos(self, mock_run, mock_aur_client):
- """Test checking official repos."""
+ def test_is_in_repos(self, mock_run, mock_aur_client):
+ """Test checking repos."""
mock_run.return_value.returncode = 0
mock_run.return_value.stdout = "core base\nextra git\ncustom mypkg\n"
resolver = DependencyResolver(mock_aur_client)
# Test default (include_all=True)
- assert resolver.is_in_official_repos("git")
- assert resolver.is_in_official_repos("mypkg")
- assert resolver.is_in_official_repos("base")
- assert not resolver.is_in_official_repos("yay")
+ assert resolver.is_in_repos("git")
+ assert resolver.is_in_repos("mypkg")
+ assert resolver.is_in_repos("base")
+ assert not resolver.is_in_repos("yay")
# Test official_only (include_all=False)
- assert resolver.is_in_official_repos("git", include_all=False)
- assert resolver.is_in_official_repos("base", include_all=False)
- assert not resolver.is_in_official_repos("mypkg", include_all=False)
+ assert resolver.is_in_repos("git", include_all=False)
+ assert resolver.is_in_repos("base", include_all=False)
+ assert not resolver.is_in_repos("mypkg", include_all=False)
+
+ @pytest.mark.asyncio
+ async def test_resolve_includes_checkdepends(self, mock_aur_client):
+ """Test that resolve includes checkdepends in the build order or dependency map."""
+ from archrepobuild.aur import Package
+
+ resolver = DependencyResolver(mock_aur_client)
+
+ # Mock AUR response
+ from datetime import datetime
+ pkg = Package(
+ name="test-pkg",
+ version="1.0",
+ description="test",
+ url=None,
+ maintainer=None,
+ votes=0,
+ popularity=0.0,
+ out_of_date=None,
+ first_submitted=datetime.now(),
+ last_modified=datetime.now(),
+ package_base="test-pkg",
+ depends=[],
+ makedepends=[],
+ checkdepends=["check-dep"],
+ )
+
+ dep_pkg = Package(
+ name="check-dep",
+ version="1.0",
+ description="test",
+ url=None,
+ maintainer=None,
+ votes=0,
+ popularity=0.0,
+ out_of_date=None,
+ first_submitted=datetime.now(),
+ last_modified=datetime.now(),
+ package_base="check-dep",
+ depends=[],
+ makedepends=[],
+ checkdepends=[],
+ )
+
+ mock_aur_client.get_packages.side_effect = [[pkg], [dep_pkg]]
+
+ # Assume neither is in repos or installed
+ with patch.object(resolver, "is_in_repos", return_value=False), \
+ patch.object(resolver, "is_installed", return_value=False):
+
+ build_order = await resolver.resolve(["test-pkg"])
+
+ assert "check-dep" in build_order.packages
+ assert "check-dep" in [d.name for d in build_order.aur_dependencies["test-pkg"]]
+ assert any(d.dep_type == DependencyType.CHECK for d in build_order.aur_dependencies["test-pkg"])
+
+ @pytest.mark.asyncio
+ async def test_resolve_with_exclude_repo(self, mock_aur_client):
+ """Test that resolve correctly handles exclude_repo."""
+ from archrepobuild.aur import Package
+
+ resolver = DependencyResolver(mock_aur_client)
+
+ from datetime import datetime
+ # Mock AUR response
+ pkg = Package(
+ name="test-pkg",
+ version="1.0",
+ description="test",
+ url=None,
+ maintainer=None,
+ votes=0,
+ popularity=0.0,
+ out_of_date=None,
+ first_submitted=datetime.now(),
+ last_modified=datetime.now(),
+ package_base="test-pkg",
+ depends=[],
+ makedepends=[],
+ checkdepends=[],
+ )
+
+ mock_aur_client.get_packages.return_value = [pkg]
+
+ # Case 1: Package in repo, not excluded -> should be skipped
+ with patch.object(resolver, "is_in_repos", return_value="myrepo"):
+ build_order = await resolver.resolve(["test-pkg"])
+ assert "test-pkg" not in build_order.packages
+
+ # Case 2: Package in repo, excluded -> should be included (AUR lookup)
+ with patch.object(resolver, "is_in_repos", return_value="myrepo"):
+ build_order = await resolver.resolve(["test-pkg"], exclude_repo="myrepo")
+ assert "test-pkg" in build_order.packages
+
+ # Case 3: Package in different repo, not excluded -> should be skipped
+ with patch.object(resolver, "is_in_repos", return_value="otherrepo"):
+ build_order = await resolver.resolve(["test-pkg"], exclude_repo="myrepo")
+ assert "test-pkg" not in build_order.packages
--
Gitblit v1.10.0