From 5c5e54228ffa0b7b73433fa83277f5ad5adaea7f Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 14 Oct 2021 04:08:21 +0300 Subject: [PATCH] use generic removal method --- src/ahriman/application/handlers/patch.py | 3 +-- .../application/handlers/test_handler_patch.py | 15 ++------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/ahriman/application/handlers/patch.py b/src/ahriman/application/handlers/patch.py index 5fffe088..9a599d74 100644 --- a/src/ahriman/application/handlers/patch.py +++ b/src/ahriman/application/handlers/patch.py @@ -68,8 +68,7 @@ class Patch(Handler): package = Package.load(sources_dir, application.repository.pacman, application.repository.aur_url) patch_dir = application.repository.paths.patches_for(package.base) - if patch_dir.is_dir(): - shutil.rmtree(patch_dir) # remove old patches + Patch.patch_set_remove(application, package.base) # remove old patches patch_dir.mkdir(mode=0o755, parents=True) Sources.patch_create(sources_dir, patch_dir / "00-main.patch", *track) diff --git a/tests/ahriman/application/handlers/test_handler_patch.py b/tests/ahriman/application/handlers/test_handler_patch.py index 5e289af5..007314d5 100644 --- a/tests/ahriman/application/handlers/test_handler_patch.py +++ b/tests/ahriman/application/handlers/test_handler_patch.py @@ -92,26 +92,15 @@ def test_patch_set_create(application: Application, package_ahriman: Package, mo must create patch set for the package """ mocker.patch("ahriman.models.package.Package.load", return_value=package_ahriman) + remove_mock = mocker.patch("ahriman.application.handlers.patch.Patch.patch_set_remove") create_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.patch_create") patch_dir = application.repository.paths.patches_for(package_ahriman.base) Patch.patch_set_create(application, Path("path"), ["*.patch"]) + remove_mock.assert_called_once_with(application, package_ahriman.base) create_mock.assert_called_once_with(Path("path"), patch_dir / "00-main.patch", "*.patch") -def test_patch_set_create_clear(application: Application, package_ahriman: Package, mocker: MockerFixture) -> None: - """ - must clear patches directory before new set creation - """ - mocker.patch("pathlib.Path.is_dir", return_value=True) - mocker.patch("ahriman.models.package.Package.load", return_value=package_ahriman) - mocker.patch("ahriman.core.build_tools.sources.Sources.patch_create") - remove_mock = mocker.patch("shutil.rmtree") - - Patch.patch_set_create(application, Path("path"), ["*.patch"]) - remove_mock.assert_called() - - def test_patch_set_remove(application: Application, package_ahriman: Package, mocker: MockerFixture) -> None: """ must remove patch set for the package