remove excess dependencies leaves

tests/ahriman/conftest.py

@@ -181,6 +181,7 @@ def aur_package_ahriman() -> AURPackage:
         provides=[],
         license=["GPL3"],
         keywords=[],
+        groups=[],
     )
 
 
@@ -228,6 +229,7 @@ def aur_package_akonadi() -> AURPackage:
         provides=[],
         license=["LGPL"],
         keywords=[],
+        groups=[],
     )
 
 
@@ -397,7 +399,8 @@ def package_description_ahriman() -> PackageDescription:
         groups=[],
         installed_size=4200000,
         licenses=["GPL3"],
-        url="https://github.com/arcan1s/ahriman")
+        url="https://github.com/arcan1s/ahriman",
+    )
 
 
 @pytest.fixture
@@ -418,7 +421,8 @@ def package_description_python_schedule() -> PackageDescription:
         groups=[],
         installed_size=4200001,
         licenses=["MIT"],
-        url="https://github.com/dbader/schedule")
+        url="https://github.com/dbader/schedule",
+    )
 
 
 @pytest.fixture
@@ -439,7 +443,8 @@ def package_description_python2_schedule() -> PackageDescription:
         groups=[],
         installed_size=4200002,
         licenses=["MIT"],
-        url="https://github.com/dbader/schedule")
+        url="https://github.com/dbader/schedule",
+    )
 
 
 @pytest.fixture

tests/ahriman/core/log/test_lazy_logging.py

@@ -30,7 +30,7 @@ def test_package_logger_set_reset(database: SQLite) -> None:
     database._package_logger_reset()
     record = logging.makeLogRecord({})
     with pytest.raises(AttributeError):
-        record.package_id
+        assert record.package_id
 
 
 def test_in_package_context(database: SQLite, package_ahriman: Package, mocker: MockerFixture) -> None:

tests/ahriman/models/conftest.py

@@ -6,10 +6,12 @@ from unittest.mock import MagicMock, PropertyMock
 from pytest_mock import MockerFixture
 
 from ahriman import __version__
+from ahriman.core.alpm.pacman import Pacman
 from ahriman.core.alpm.remote import AUR
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 from ahriman.models.counters import Counters
+from ahriman.models.filesystem_package import FilesystemPackage
 from ahriman.models.internal_status import InternalStatus
 from ahriman.models.package import Package
 from ahriman.models.package_archive import PackageArchive
@@ -46,6 +48,17 @@ def counters() -> Counters:
                     success=0)
 
 
+@pytest.fixture
+def filesystem_package() -> FilesystemPackage:
+    """
+    filesystem_package fixture
+
+    Returns:
+        FilesystemPackage: filesystem package test instance
+    """
+    return FilesystemPackage(package_name="package", depends={"dependency"}, opt_depends={"optional"})
+
+
 @pytest.fixture
 def internal_status(counters: Counters) -> InternalStatus:
     """
@@ -65,7 +78,7 @@ def internal_status(counters: Counters) -> InternalStatus:
 
 
 @pytest.fixture
-def package_archive_ahriman(package_ahriman: Package, repository_paths: RepositoryPaths,
+def package_archive_ahriman(package_ahriman: Package, repository_paths: RepositoryPaths, pacman: Pacman,
                             passwd: Any, mocker: MockerFixture) -> PackageArchive:
     """
     package archive fixture
@@ -73,6 +86,7 @@ def package_archive_ahriman(package_ahriman: Package, repository_paths: Reposito
     Args:
         package_ahriman(Package): package test instance
         repository_paths(RepositoryPaths): repository paths test instance
+        pacman(Pacman): pacman test instance
         passwd(Any): passwd structure test instance
         mocker(MockerFixture): mocker object
 
@@ -80,7 +94,7 @@ def package_archive_ahriman(package_ahriman: Package, repository_paths: Reposito
         PackageArchive: package archive test instance
     """
     mocker.patch("ahriman.models.repository_paths.getpwuid", return_value=passwd)
-    return PackageArchive(repository_paths.build_directory, package_ahriman)
+    return PackageArchive(repository_paths.build_directory, package_ahriman, pacman)
 
 
 @pytest.fixture
@@ -150,6 +164,7 @@ def pyalpm_package_ahriman(aur_package_ahriman: AURPackage) -> MagicMock:
     type(mock).provides = PropertyMock(return_value=aur_package_ahriman.provides)
     type(mock).version = PropertyMock(return_value=aur_package_ahriman.version)
     type(mock).url = PropertyMock(return_value=aur_package_ahriman.url)
+    type(mock).groups = PropertyMock(return_value=aur_package_ahriman.groups)
 
     return mock
 

tests/ahriman/models/test_dependencies.py

@@ -1,6 +1,13 @@
 from ahriman.models.dependencies import Dependencies
 
 
+def test_post_init() -> None:
+    """
+    must remove empty leaves
+    """
+    assert Dependencies({"path": ["package"], "empty": []}) == Dependencies({"path": ["package"]})
+
+
 def test_from_json_view() -> None:
     """
     must construct and serialize dependencies to json

tests/ahriman/models/test_filesystem_package.py

@@ -0,0 +1,60 @@
+from ahriman.models.filesystem_package import FilesystemPackage
+
+
+def test_post_init() -> None:
+    """
+    must trim versions and descriptions from dependencies list
+    """
+    assert FilesystemPackage(package_name="p", depends={"a=1"}, opt_depends={"c: a description"}) == \
+        FilesystemPackage(package_name="p", depends={"a"}, opt_depends={"c"})
+
+
+def test_depends_on(filesystem_package: FilesystemPackage) -> None:
+    """
+    must correctly check package dependencies
+    """
+    assert filesystem_package.depends_on("dependency", include_optional=False)
+    assert not filesystem_package.depends_on("random", include_optional=False)
+
+
+def test_depends_on_optional(filesystem_package: FilesystemPackage) -> None:
+    """
+    must correctly check optional dependencies
+    """
+    assert filesystem_package.depends_on("optional", include_optional=True)
+    assert not filesystem_package.depends_on("optional", include_optional=False)
+    assert not filesystem_package.depends_on("random", include_optional=True)
+
+
+def test_is_root_package() -> None:
+    """
+    must correctly identify root packages
+    """
+    package = FilesystemPackage(package_name="package", depends={"dependency"}, opt_depends={"optional"})
+    dependency = FilesystemPackage(package_name="dependency", depends=set(), opt_depends=set())
+    optional = FilesystemPackage(package_name="optional", depends=set(), opt_depends={"package"})
+    packages = [package, dependency, optional]
+
+    assert not package.is_root_package(packages, include_optional=True)
+    assert not package.is_root_package(packages, include_optional=False)
+
+    assert dependency.is_root_package(packages, include_optional=True)
+    assert dependency.is_root_package(packages, include_optional=False)
+
+    assert not optional.is_root_package(packages, include_optional=True)
+    assert optional.is_root_package(packages, include_optional=False)
+
+
+def test_is_root_package_circular() -> None:
+    """
+    must correctly identify root packages with circular dependencies
+    """
+    package1 = FilesystemPackage(package_name="package1", depends={"package2"}, opt_depends=set())
+    package2 = FilesystemPackage(package_name="package2", depends={"package1"}, opt_depends=set())
+    assert package1.is_root_package([package1, package2], include_optional=False)
+    assert package2.is_root_package([package1, package2], include_optional=False)
+
+    package1 = FilesystemPackage(package_name="package1", depends=set(), opt_depends={"package2"})
+    package2 = FilesystemPackage(package_name="package2", depends=set(), opt_depends={"package1"})
+    assert not package1.is_root_package([package1, package2], include_optional=True)
+    assert package1.is_root_package([package1, package2], include_optional=False)