refactor: lightweight Package.from_archive method

tests/ahriman/core/database/migrations/test_m005_make_opt_depends.py

@@ -34,8 +34,7 @@ def test_migrate_package_depends(connection: Connection, configuration: Configur
     package_mock = mocker.patch("ahriman.models.package.Package.from_archive", return_value=package_ahriman)
 
     migrate_package_depends(connection, configuration)
-    package_mock.assert_called_once_with(
-        package_ahriman.packages[package_ahriman.base].filepath, pytest.helpers.anyvar(int))
+    package_mock.assert_called_once_with(package_ahriman.packages[package_ahriman.base].filepath)
     connection.executemany.assert_called_once_with(pytest.helpers.anyvar(str, strict=True), [{
         "make_depends": package_ahriman.packages[package_ahriman.base].make_depends,
         "opt_depends": package_ahriman.packages[package_ahriman.base].opt_depends,

tests/ahriman/core/database/migrations/test_m007_check_depends.py

@@ -34,8 +34,7 @@ def test_migrate_package_depends(connection: Connection, configuration: Configur
     package_mock = mocker.patch("ahriman.models.package.Package.from_archive", return_value=package_ahriman)
 
     migrate_package_check_depends(connection, configuration)
-    package_mock.assert_called_once_with(
-        package_ahriman.packages[package_ahriman.base].filepath, pytest.helpers.anyvar(int))
+    package_mock.assert_called_once_with(package_ahriman.packages[package_ahriman.base].filepath)
     connection.executemany.assert_called_once_with(pytest.helpers.anyvar(str, strict=True), [{
         "check_depends": package_ahriman.packages[package_ahriman.base].check_depends,
         "package": package_ahriman.base,

tests/ahriman/core/database/migrations/test_m008_packagers.py

@@ -34,8 +34,7 @@ def test_migrate_package_base_packager(connection: Connection, configuration: Co
     package_mock = mocker.patch("ahriman.models.package.Package.from_archive", return_value=package_ahriman)
 
     migrate_package_base_packager(connection, configuration)
-    package_mock.assert_called_once_with(
-        package_ahriman.packages[package_ahriman.base].filepath, pytest.helpers.anyvar(int))
+    package_mock.assert_called_once_with(package_ahriman.packages[package_ahriman.base].filepath)
     connection.executemany.assert_called_once_with(pytest.helpers.anyvar(str, strict=True), [{
         "package_base": package_ahriman.base,
         "packager": package_ahriman.packager,

tests/ahriman/core/database/migrations/test_m016_archive.py

@@ -7,7 +7,6 @@ from sqlite3 import Connection
 from typing import Any
 from unittest.mock import call as MockCall
 
-from ahriman.core.alpm.pacman import Pacman
 from ahriman.core.configuration import Configuration
 from ahriman.core.database.migrations.m016_archive import migrate_data, move_packages
 from ahriman.models.package import Package
@@ -28,12 +27,12 @@ def test_migrate_data(connection: Connection, configuration: Configuration, mock
 
     migrate_data(connection, configuration)
     migration_mock.assert_has_calls([
-        MockCall(replace(configuration.repository_paths, repository_id=repository), pytest.helpers.anyvar(int))
+        MockCall(replace(configuration.repository_paths, repository_id=repository))
         for repository in repositories
     ])
 
 
-def test_move_packages(repository_paths: RepositoryPaths, pacman: Pacman, package_ahriman: Package,
+def test_move_packages(repository_paths: RepositoryPaths, package_ahriman: Package,
                        mocker: MockerFixture) -> None:
     """
     must move packages to the archive directory
@@ -57,9 +56,9 @@ def test_move_packages(repository_paths: RepositoryPaths, pacman: Pacman, packag
     move_mock = mocker.patch("ahriman.core.database.migrations.m016_archive.atomic_move")
     symlink_mock = mocker.patch("pathlib.Path.symlink_to")
 
-    move_packages(repository_paths, pacman)
+    move_packages(repository_paths)
     archive_mock.assert_has_calls([
-        MockCall(repository_paths.repository / filename, pacman)
+        MockCall(repository_paths.repository / filename)
         for filename in ("file.pkg.tar.xz", "file2.pkg.tar.xz")
     ])
     move_mock.assert_has_calls([

tests/ahriman/core/repository/test_executor.py

@@ -118,7 +118,7 @@ def test_package_build(executor: Executor, package_ahriman: Package, mocker: Moc
     init_mock.assert_called_once_with(pytest.helpers.anyvar(int), pytest.helpers.anyvar(int), None)
     package_mock.assert_called_once_with(Path("local"), executor.architecture, None)
     lookup_mock.assert_called_once_with(package_ahriman)
-    with_packages_mock.assert_called_once_with([Path(package_ahriman.base)], executor.pacman)
+    with_packages_mock.assert_called_once_with([Path(package_ahriman.base)])
     rename_mock.assert_called_once_with(Path(package_ahriman.base), executor.paths.packages / package_ahriman.base)
 
 

tests/ahriman/models/conftest.py

@@ -89,22 +89,6 @@ def pkgbuild_ahriman(resource_path_root: Path) -> Pkgbuild:
     return Pkgbuild.from_file(pkgbuild)
 
 
-@pytest.fixture
-def pyalpm_handle(pyalpm_package_ahriman: MagicMock) -> MagicMock:
-    """
-    mock object for pyalpm
-
-    Args:
-        pyalpm_package_ahriman(MagicMock): mock object for pyalpm package
-
-    Returns:
-        MagicMock: pyalpm mock
-    """
-    mock = MagicMock()
-    mock.handle.load_pkg.return_value = pyalpm_package_ahriman
-    return mock
-
-
 @pytest.fixture
 def pyalpm_package_description_ahriman(package_description_ahriman: PackageDescription) -> MagicMock:
     """

tests/ahriman/models/test_package.py

@@ -148,13 +148,14 @@ def test_packages_full(package_ahriman: Package) -> None:
     assert package_ahriman.packages_full == [package_ahriman.base, f"{package_ahriman.base}-git"]
 
 
-def test_from_archive(package_ahriman: Package, pyalpm_handle: MagicMock, mocker: MockerFixture) -> None:
+def test_from_archive(package_ahriman: Package, pyalpm_package_ahriman: MagicMock, mocker: MockerFixture) -> None:
     """
     must construct package from alpm library
     """
+    mocker.patch("ahriman.models.pacman_handle.PacmanHandle.package_load", return_value=pyalpm_package_ahriman)
     mocker.patch("ahriman.models.package_description.PackageDescription.from_package",
                  return_value=package_ahriman.packages[package_ahriman.base])
-    generated = Package.from_archive(Path("path"), pyalpm_handle)
+    generated = Package.from_archive(Path("path"))
     generated.remote = package_ahriman.remote
 
     assert generated == package_ahriman
@@ -165,13 +166,12 @@ def test_from_archive_empty_base(package_ahriman: Package, pyalpm_package_ahrima
     """
     must construct package with empty base from alpm library
     """
-    pyalpm_handle = MagicMock()
     type(pyalpm_package_ahriman).base = PropertyMock(return_value=None)
-    pyalpm_handle.handle.load_pkg.return_value = pyalpm_package_ahriman
+    mocker.patch("ahriman.models.pacman_handle.PacmanHandle.package_load", return_value=pyalpm_package_ahriman)
 
     mocker.patch("ahriman.models.package_description.PackageDescription.from_package",
                  return_value=package_ahriman.packages[package_ahriman.base])
-    generated = Package.from_archive(Path("path"), pyalpm_handle)
+    generated = Package.from_archive(Path("path"))
     generated.remote = package_ahriman.remote
 
     assert generated == package_ahriman
@@ -362,7 +362,7 @@ def test_vercmp(package_ahriman: Package, mocker: MockerFixture) -> None:
     vercmp_mock.assert_called_once_with(package_ahriman.version, "version")
 
 
-def test_with_packages(package_ahriman: Package, package_python_schedule: Package, pacman: Pacman,
+def test_with_packages(package_ahriman: Package, package_python_schedule: Package,
                        mocker: MockerFixture) -> None:
     """
     must correctly replace packages descriptions
@@ -375,8 +375,8 @@ def test_with_packages(package_ahriman: Package, package_python_schedule: Packag
     result = copy.deepcopy(package_ahriman)
     package_ahriman.packages[package_ahriman.base].architecture = "i686"
 
-    result.with_packages(paths, pacman)
+    result.with_packages(paths)
     from_archive_mock.assert_has_calls([
-        MockCall(path, pacman) for path in paths
+        MockCall(path) for path in paths
     ])
     assert result.packages[result.base] == package_ahriman.packages[package_ahriman.base]

tests/ahriman/models/test_pacman_handle.py

@@ -0,0 +1,37 @@
+import pytest
+
+from pathlib import Path
+from unittest.mock import MagicMock
+
+from ahriman.models.pacman_handle import PacmanHandle
+
+
+def test_package_load() -> None:
+    """
+    must load package from archive path
+    """
+    local = Path("local")
+    instance = PacmanHandle.ephemeral()
+    handle_mock = instance.handle = MagicMock()
+
+    instance.package_load(local)
+    handle_mock.load_pkg.assert_called_once_with(str(local))
+
+    PacmanHandle._ephemeral = None
+
+
+def test_getattr() -> None:
+    """
+    must proxy attribute access to underlying handle
+    """
+    instance = PacmanHandle.ephemeral()
+    assert instance.dbpath
+
+
+def test_getattr_not_found() -> None:
+    """
+    must raise AttributeError for missing handle attributes
+    """
+    instance = PacmanHandle.ephemeral()
+    with pytest.raises(AttributeError):
+        assert instance.random_attribute