arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-06-28 06:41:43 +00:00
Code Issues Projects Releases Wiki Activity

fix issues with remote pull triggers (see #103)

Browse Source 
* The issue appears when repository contains PKGBUILD in root. In this
  case it will copy tree with loosing package information, because
  the repository will be cloned to temporary path with random generated
  name
* The issue appears when branch which is different from master is used
  for any reposittory with git files (e.g. single-pkgbuild repo or repo
  with submodules)
This commit is contained in:
Evgenii Alekseev
2023-08-08 02:30:44 +03:00
parent bd0f850d25
commit 237fec3f85
4 changed files with 66 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tests/ahriman/core/gitremote/test_remote_pull.py
View File

@ -7,6 +7,7 @@ from unittest.mock import call as MockCall
from ahriman.core.configuration import Configuration
from ahriman.core.exceptions import GitRemoteError
from ahriman.core.gitremote.remote_pull import RemotePull
from ahriman.models.package import Package
def test_repo_clone(configuration: Configuration, mocker: MockerFixture) -> None:
@ -15,36 +16,53 @@ def test_repo_clone(configuration: Configuration, mocker: MockerFixture) -> None
"""
fetch_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.fetch")
copy_mock = mocker.patch("ahriman.core.gitremote.remote_pull.RemotePull.repo_copy")
runner = RemotePull(configuration, "gitremote")
runner = RemotePull(configuration, "x86_64", "gitremote")
runner.repo_clone()
fetch_mock.assert_called_once_with(pytest.helpers.anyvar(int), runner.remote_source)
copy_mock.assert_called_once_with(pytest.helpers.anyvar(int))
def test_package_copy(configuration: Configuration, package_ahriman: Package, mocker: MockerFixture) -> None:
"""
must copy single package
"""
package_mock = mocker.patch("ahriman.models.package.Package.from_build", return_value=package_ahriman)
patterns = object()
ignore_patterns_mock = mocker.patch("shutil.ignore_patterns", return_value=patterns)
copytree_mock = mocker.patch("shutil.copytree")
init_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.init")
runner = RemotePull(configuration, "x86_64", "gitremote")
local = Path("local")
runner.package_copy(local / "PKGBUILD")
package_mock.assert_called_once_with(local, "x86_64", None)
ignore_patterns_mock.assert_called_once_with(".git*")
copytree_mock.assert_called_once_with(
local, configuration.repository_paths.cache_for(package_ahriman.base),
ignore=patterns, dirs_exist_ok=True)
init_mock.assert_called_once_with(configuration.repository_paths.cache_for(package_ahriman.base))
def test_repo_copy(configuration: Configuration, mocker: MockerFixture) -> None:
"""
must copy repository tree from temporary directory to the local cache
"""
local = Path("local")
mocker.patch("ahriman.core.gitremote.remote_pull.walk", return_value=[
Path("local") / "package1" / "PKGBUILD",
Path("local") / "package1" / ".SRCINFO",
Path("local") / "package2" / ".SRCINFO",
Path("local") / "package3" / "PKGBUILD",
Path("local") / "package3" / ".SRCINFO",
local / "package1" / "PKGBUILD",
local / "package1" / ".SRCINFO",
local / "package2" / ".SRCINFO",
local / "package3" / "PKGBUILD",
local / "package3" / ".SRCINFO",
])
copytree_mock = mocker.patch("shutil.copytree")
init_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.init")
runner = RemotePull(configuration, "gitremote")
copy_mock = mocker.patch("ahriman.core.gitremote.remote_pull.RemotePull.package_copy")
runner = RemotePull(configuration, "x86_64", "gitremote")
runner.repo_copy(Path("local"))
copytree_mock.assert_has_calls([
MockCall(Path("local") / "package1", configuration.repository_paths.cache_for("package1"), dirs_exist_ok=True),
MockCall(Path("local") / "package3", configuration.repository_paths.cache_for("package3"), dirs_exist_ok=True),
])
init_mock.assert_has_calls([
MockCall(configuration.repository_paths.cache_for("package1")),
MockCall(configuration.repository_paths.cache_for("package3")),
runner.repo_copy(local)
copy_mock.assert_has_calls([
MockCall(local / "package1" / "PKGBUILD"),
MockCall(local / "package3" / "PKGBUILD"),
])
@ -53,7 +71,7 @@ def test_run(configuration: Configuration, mocker: MockerFixture) -> None:
must clone repo on run
"""
clone_mock = mocker.patch("ahriman.core.gitremote.remote_pull.RemotePull.repo_clone")
runner = RemotePull(configuration, "gitremote")
runner = RemotePull(configuration, "x86_64", "gitremote")
runner.run()
clone_mock.assert_called_once_with()
@ -64,7 +82,7 @@ def test_run_failed(configuration: Configuration, mocker: MockerFixture) -> None
must reraise exception on error occurred
"""
mocker.patch("ahriman.core.gitremote.remote_pull.RemotePull.repo_clone", side_effect=Exception())
runner = RemotePull(configuration, "gitremote")
runner = RemotePull(configuration, "x86_64", "gitremote")
with pytest.raises(GitRemoteError):
runner.run()