mirror of
https://github.com/arcan1s/ahriman.git
synced 2025-11-12 19:43:42 +00:00
Compare commits
8 Commits
feature/tr
...
10b783ab8d
| Author | SHA1 | Date | |
|---|---|---|---|
| 10b783ab8d | |||
| c89f6ad98c | |||
| c734f0815a | |||
| dc3cee9449 | |||
| 0b2acfac9b | |||
| c5d849d6a6 | |||
| 63ccb5fc11 | |||
| 04e554d096 |
@ -1,29 +0,0 @@
|
|||||||
ahriman.core.archive package
|
|
||||||
============================
|
|
||||||
|
|
||||||
Submodules
|
|
||||||
----------
|
|
||||||
|
|
||||||
ahriman.core.archive.archive\_tree module
|
|
||||||
-----------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.core.archive.archive_tree
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
ahriman.core.archive.archive\_trigger module
|
|
||||||
--------------------------------------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.core.archive.archive_trigger
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
|
|
||||||
Module contents
|
|
||||||
---------------
|
|
||||||
|
|
||||||
.. automodule:: ahriman.core.archive
|
|
||||||
:members:
|
|
||||||
:no-undoc-members:
|
|
||||||
:show-inheritance:
|
|
||||||
@ -8,7 +8,6 @@ Subpackages
|
|||||||
:maxdepth: 4
|
:maxdepth: 4
|
||||||
|
|
||||||
ahriman.core.alpm
|
ahriman.core.alpm
|
||||||
ahriman.core.archive
|
|
||||||
ahriman.core.auth
|
ahriman.core.auth
|
||||||
ahriman.core.build_tools
|
ahriman.core.build_tools
|
||||||
ahriman.core.configuration
|
ahriman.core.configuration
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#
|
#
|
||||||
|
from ahriman.core import context
|
||||||
from ahriman.core.archive.archive_tree import ArchiveTree
|
from ahriman.core.archive.archive_tree import ArchiveTree
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.core.sign.gpg import GPG
|
from ahriman.core.sign.gpg import GPG
|
||||||
@ -44,7 +45,9 @@ class ArchiveTrigger(Trigger):
|
|||||||
Trigger.__init__(self, repository_id, configuration)
|
Trigger.__init__(self, repository_id, configuration)
|
||||||
|
|
||||||
self.paths = configuration.repository_paths
|
self.paths = configuration.repository_paths
|
||||||
self.tree = ArchiveTree(self.paths, GPG(configuration).repository_sign_args)
|
|
||||||
|
ctx = context.get()
|
||||||
|
self.tree = ArchiveTree(self.paths, ctx.get(GPG).repository_sign_args)
|
||||||
|
|
||||||
def on_result(self, result: Result, packages: list[Package]) -> None:
|
def on_result(self, result: Result, packages: list[Package]) -> None:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -36,7 +36,6 @@ class Trigger(LazyLogging):
|
|||||||
CONFIGURATION_SCHEMA(ConfigurationSchema): (class attribute) configuration schema template
|
CONFIGURATION_SCHEMA(ConfigurationSchema): (class attribute) configuration schema template
|
||||||
CONFIGURATION_SCHEMA_FALLBACK(str | None): (class attribute) optional fallback option for defining
|
CONFIGURATION_SCHEMA_FALLBACK(str | None): (class attribute) optional fallback option for defining
|
||||||
configuration schema type used
|
configuration schema type used
|
||||||
REQUIRES_REPOSITORY(bool): (class attribute) either trigger requires loaded repository or not
|
|
||||||
configuration(Configuration): configuration instance
|
configuration(Configuration): configuration instance
|
||||||
repository_id(RepositoryId): repository unique identifier
|
repository_id(RepositoryId): repository unique identifier
|
||||||
|
|
||||||
@ -60,7 +59,6 @@ class Trigger(LazyLogging):
|
|||||||
|
|
||||||
CONFIGURATION_SCHEMA: ClassVar[ConfigurationSchema] = {}
|
CONFIGURATION_SCHEMA: ClassVar[ConfigurationSchema] = {}
|
||||||
CONFIGURATION_SCHEMA_FALLBACK: ClassVar[str | None] = None
|
CONFIGURATION_SCHEMA_FALLBACK: ClassVar[str | None] = None
|
||||||
REQUIRES_REPOSITORY: ClassVar[bool] = True
|
|
||||||
|
|
||||||
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
def __init__(self, repository_id: RepositoryId, configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
@ -81,16 +79,6 @@ class Trigger(LazyLogging):
|
|||||||
"""
|
"""
|
||||||
return self.repository_id.architecture
|
return self.repository_id.architecture
|
||||||
|
|
||||||
@property
|
|
||||||
def is_allowed_to_run(self) -> bool:
|
|
||||||
"""
|
|
||||||
whether trigger allowed to run or not
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
bool: ``True`` in case if trigger allowed to run and ``False`` otherwise
|
|
||||||
"""
|
|
||||||
return not (self.REQUIRES_REPOSITORY and self.repository_id.is_empty)
|
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def configuration_schema(cls, configuration: Configuration | None) -> ConfigurationSchema:
|
def configuration_schema(cls, configuration: Configuration | None) -> ConfigurationSchema:
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -77,9 +77,8 @@ class TriggerLoader(LazyLogging):
|
|||||||
"""
|
"""
|
||||||
instance = cls()
|
instance = cls()
|
||||||
instance.triggers = [
|
instance.triggers = [
|
||||||
trigger
|
instance.load_trigger(trigger, repository_id, configuration)
|
||||||
for trigger_name in instance.selected_triggers(configuration)
|
for trigger in instance.selected_triggers(configuration)
|
||||||
if (trigger := instance.load_trigger(trigger_name, repository_id, configuration)).is_allowed_to_run
|
|
||||||
]
|
]
|
||||||
|
|
||||||
return instance
|
return instance
|
||||||
|
|||||||
@ -57,7 +57,7 @@ def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
|
|||||||
assert check_output_mock.call_args[0][0] == "repo-add"
|
assert check_output_mock.call_args[0][0] == "repo-add"
|
||||||
|
|
||||||
|
|
||||||
def test_repo_remove(repo: Repo, package_ahriman: Package, mocker: MockerFixture) -> None:
|
def test_repo_remove(repo: Repo, package_ahriman: Package,mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must call repo-remove on package removal
|
must call repo-remove on package removal
|
||||||
"""
|
"""
|
||||||
|
|||||||
@ -1,8 +1,11 @@
|
|||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
from ahriman.core.archive import ArchiveTrigger
|
from ahriman.core.archive import ArchiveTrigger
|
||||||
from ahriman.core.archive.archive_tree import ArchiveTree
|
from ahriman.core.archive.archive_tree import ArchiveTree
|
||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
|
from ahriman.core.sign.gpg import GPG
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
@ -20,15 +23,18 @@ def archive_tree(configuration: Configuration) -> ArchiveTree:
|
|||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def archive_trigger(configuration: Configuration) -> ArchiveTrigger:
|
def archive_trigger(configuration: Configuration, gpg: GPG, mocker: MockerFixture) -> ArchiveTrigger:
|
||||||
"""
|
"""
|
||||||
archive trigger fixture
|
archive trigger fixture
|
||||||
|
|
||||||
Args:
|
Args:
|
||||||
configuration(Configuration): configuration fixture
|
configuration(Configuration): configuration fixture
|
||||||
|
gpg(GPG): GPG fixture
|
||||||
|
mocker(MockerFixture): mocker object
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
ArchiveTrigger: archive trigger test instance
|
ArchiveTrigger: archive trigger test instance
|
||||||
"""
|
"""
|
||||||
|
mocker.patch("ahriman.core._Context.get", return_value=GPG)
|
||||||
_, repository_id = configuration.check_loaded()
|
_, repository_id = configuration.check_loaded()
|
||||||
return ArchiveTrigger(repository_id, configuration)
|
return ArchiveTrigger(repository_id, configuration)
|
||||||
@ -1,3 +1,4 @@
|
|||||||
|
from dataclasses import replace
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from pytest_mock import MockerFixture
|
from pytest_mock import MockerFixture
|
||||||
|
|
||||||
@ -22,7 +23,6 @@ def test_symlinks_create(archive_tree: ArchiveTree, package_ahriman: Package, pa
|
|||||||
must create symlinks
|
must create symlinks
|
||||||
"""
|
"""
|
||||||
_original_exists = Path.exists
|
_original_exists = Path.exists
|
||||||
|
|
||||||
def exists_mock(path: Path) -> bool:
|
def exists_mock(path: Path) -> bool:
|
||||||
if path.name in (package.filename for package in package_python_schedule.packages.values()):
|
if path.name in (package.filename for package in package_python_schedule.packages.values()):
|
||||||
return True
|
return True
|
||||||
@ -63,53 +63,6 @@ def test_symlinks_create_empty_filename(archive_tree: ArchiveTree, package_ahrim
|
|||||||
symlinks_mock.assert_not_called()
|
symlinks_mock.assert_not_called()
|
||||||
|
|
||||||
|
|
||||||
def test_symlinks_fix(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
|
|
||||||
"""
|
|
||||||
must fix broken symlinks
|
|
||||||
"""
|
|
||||||
_original_exists = Path.exists
|
|
||||||
|
|
||||||
def exists_mock(path: Path) -> bool:
|
|
||||||
if path.name == "symlink":
|
|
||||||
return True
|
|
||||||
return _original_exists(path)
|
|
||||||
|
|
||||||
mocker.patch("pathlib.Path.is_symlink", side_effect=[True, True, False])
|
|
||||||
mocker.patch("pathlib.Path.exists", autospec=True, side_effect=exists_mock)
|
|
||||||
walk_mock = mocker.patch("ahriman.core.archive.archive_tree.walk", return_value=[
|
|
||||||
archive_tree.repository_for() / filename
|
|
||||||
for filename in ("symlink", "broken_symlink", "file")
|
|
||||||
])
|
|
||||||
remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
|
|
||||||
|
|
||||||
archive_tree.symlinks_fix()
|
|
||||||
walk_mock.assert_called_once_with(archive_tree.paths.archive / "repos")
|
|
||||||
remove_mock.assert_called_once_with(None, archive_tree.repository_for() / "broken_symlink")
|
|
||||||
|
|
||||||
|
|
||||||
def test_symlinks_fix_foreign_repository(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
|
|
||||||
"""
|
|
||||||
must skip symlinks check if repository name or architecture doesn't match
|
|
||||||
"""
|
|
||||||
_original_exists = Path.exists
|
|
||||||
|
|
||||||
def exists_mock(path: Path) -> bool:
|
|
||||||
if path.name == "symlink":
|
|
||||||
return True
|
|
||||||
return _original_exists(path)
|
|
||||||
|
|
||||||
mocker.patch("pathlib.Path.is_symlink", side_effect=[True, True, False])
|
|
||||||
mocker.patch("pathlib.Path.exists", autospec=True, side_effect=exists_mock)
|
|
||||||
mocker.patch("ahriman.core.archive.archive_tree.walk", return_value=[
|
|
||||||
archive_tree.repository_for().with_name("i686") / filename
|
|
||||||
for filename in ("symlink", "broken_symlink", "file")
|
|
||||||
])
|
|
||||||
remove_mock = mocker.patch("ahriman.core.alpm.repo.Repo.remove")
|
|
||||||
|
|
||||||
archive_tree.symlinks_fix()
|
|
||||||
remove_mock.assert_not_called()
|
|
||||||
|
|
||||||
|
|
||||||
def test_tree_create(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
|
def test_tree_create(archive_tree: ArchiveTree, mocker: MockerFixture) -> None:
|
||||||
"""
|
"""
|
||||||
must create repository root if not exists
|
must create repository root if not exists
|
||||||
|
|||||||
@ -3,7 +3,6 @@ from unittest.mock import MagicMock
|
|||||||
from ahriman.core.configuration import Configuration
|
from ahriman.core.configuration import Configuration
|
||||||
from ahriman.core.report import ReportTrigger
|
from ahriman.core.report import ReportTrigger
|
||||||
from ahriman.core.triggers import Trigger
|
from ahriman.core.triggers import Trigger
|
||||||
from ahriman.models.repository_id import RepositoryId
|
|
||||||
from ahriman.models.result import Result
|
from ahriman.models.result import Result
|
||||||
|
|
||||||
|
|
||||||
@ -14,19 +13,6 @@ def test_architecture(trigger: Trigger) -> None:
|
|||||||
assert trigger.architecture == trigger.repository_id.architecture
|
assert trigger.architecture == trigger.repository_id.architecture
|
||||||
|
|
||||||
|
|
||||||
def test_is_allowed_to_run(trigger: Trigger) -> None:
|
|
||||||
"""
|
|
||||||
must return flag correctly
|
|
||||||
"""
|
|
||||||
assert trigger.is_allowed_to_run
|
|
||||||
|
|
||||||
trigger.repository_id = RepositoryId("", "")
|
|
||||||
assert not trigger.is_allowed_to_run
|
|
||||||
|
|
||||||
trigger.REQUIRES_REPOSITORY = False
|
|
||||||
assert trigger.is_allowed_to_run
|
|
||||||
|
|
||||||
|
|
||||||
def test_configuration_schema(configuration: Configuration) -> None:
|
def test_configuration_schema(configuration: Configuration) -> None:
|
||||||
"""
|
"""
|
||||||
must return used configuration schema
|
must return used configuration schema
|
||||||
|
|||||||
Reference in New Issue
Block a user