From f12786a0c682a5247751ae03c958e5003da50c9f Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Tue, 16 Sep 2025 15:29:33 +0300 Subject: [PATCH] gpg loader fix --- src/ahriman/core/archive/archive_trigger.py | 5 +---- tests/ahriman/core/archive/conftest.py | 8 +------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/ahriman/core/archive/archive_trigger.py b/src/ahriman/core/archive/archive_trigger.py index 935974f7..dfe21cc6 100644 --- a/src/ahriman/core/archive/archive_trigger.py +++ b/src/ahriman/core/archive/archive_trigger.py @@ -17,7 +17,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . # -from ahriman.core import context from ahriman.core.archive.archive_tree import ArchiveTree from ahriman.core.configuration import Configuration from ahriman.core.sign.gpg import GPG @@ -45,9 +44,7 @@ class ArchiveTrigger(Trigger): Trigger.__init__(self, repository_id, configuration) self.paths = configuration.repository_paths - - ctx = context.get() - self.tree = ArchiveTree(self.paths, ctx.get(GPG).repository_sign_args) + self.tree = ArchiveTree(self.paths, GPG(configuration).repository_sign_args) def on_result(self, result: Result, packages: list[Package]) -> None: """ diff --git a/tests/ahriman/core/archive/conftest.py b/tests/ahriman/core/archive/conftest.py index 16b56863..8eb910a5 100644 --- a/tests/ahriman/core/archive/conftest.py +++ b/tests/ahriman/core/archive/conftest.py @@ -1,11 +1,8 @@ import pytest -from pytest_mock import MockerFixture - from ahriman.core.archive import ArchiveTrigger from ahriman.core.archive.archive_tree import ArchiveTree from ahriman.core.configuration import Configuration -from ahriman.core.sign.gpg import GPG @pytest.fixture @@ -23,18 +20,15 @@ def archive_tree(configuration: Configuration) -> ArchiveTree: @pytest.fixture -def archive_trigger(configuration: Configuration, gpg: GPG, mocker: MockerFixture) -> ArchiveTrigger: +def archive_trigger(configuration: Configuration) -> ArchiveTrigger: """ archive trigger fixture Args: configuration(Configuration): configuration fixture - gpg(GPG): GPG fixture - mocker(MockerFixture): mocker object Returns: ArchiveTrigger: archive trigger test instance """ - mocker.patch("ahriman.core._Context.get", return_value=GPG) _, repository_id = configuration.check_loaded() return ArchiveTrigger(repository_id, configuration)