mirror of
				https://github.com/arcan1s/ahriman.git
				synced 2025-11-04 07:43:42 +00:00 
			
		
		
		
	allow to filter packages for rebuild by their statuses
This commit is contained in:
		@ -8,6 +8,7 @@ from ahriman.application.application import Application
 | 
			
		||||
from ahriman.application.handlers import Rebuild
 | 
			
		||||
from ahriman.core.configuration import Configuration
 | 
			
		||||
from ahriman.core.repository import Repository
 | 
			
		||||
from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 | 
			
		||||
from ahriman.models.package import Package
 | 
			
		||||
from ahriman.models.result import Result
 | 
			
		||||
 | 
			
		||||
@ -26,6 +27,7 @@ def _default_args(args: argparse.Namespace) -> argparse.Namespace:
 | 
			
		||||
    args.dry_run = False
 | 
			
		||||
    args.from_database = False
 | 
			
		||||
    args.exit_code = False
 | 
			
		||||
    args.status = None
 | 
			
		||||
    return args
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -46,7 +48,7 @@ def test_run(args: argparse.Namespace, package_ahriman: Package, configuration:
 | 
			
		||||
    on_start_mock = mocker.patch("ahriman.application.application.Application.on_start")
 | 
			
		||||
 | 
			
		||||
    Rebuild.run(args, "x86_64", configuration, report=False, unsafe=False)
 | 
			
		||||
    extract_mock.assert_called_once_with(pytest.helpers.anyvar(int), from_database=args.from_database)
 | 
			
		||||
    extract_mock.assert_called_once_with(pytest.helpers.anyvar(int), args.status, from_database=args.from_database)
 | 
			
		||||
    application_packages_mock.assert_called_once_with([package_ahriman], None)
 | 
			
		||||
    application_mock.assert_called_once_with([package_ahriman])
 | 
			
		||||
    check_mock.assert_has_calls([MockCall(False, False), MockCall(False, False)])
 | 
			
		||||
@ -56,7 +58,7 @@ def test_run(args: argparse.Namespace, package_ahriman: Package, configuration:
 | 
			
		||||
def test_run_extract_packages(args: argparse.Namespace, configuration: Configuration, repository: Repository,
 | 
			
		||||
                              mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must run command
 | 
			
		||||
    must run command from database
 | 
			
		||||
    """
 | 
			
		||||
    args = _default_args(args)
 | 
			
		||||
    args.from_database = True
 | 
			
		||||
@ -66,7 +68,7 @@ def test_run_extract_packages(args: argparse.Namespace, configuration: Configura
 | 
			
		||||
    extract_mock = mocker.patch("ahriman.application.handlers.Rebuild.extract_packages", return_value=[])
 | 
			
		||||
 | 
			
		||||
    Rebuild.run(args, "x86_64", configuration, report=False, unsafe=False)
 | 
			
		||||
    extract_mock.assert_called_once_with(pytest.helpers.anyvar(int), from_database=args.from_database)
 | 
			
		||||
    extract_mock.assert_called_once_with(pytest.helpers.anyvar(int), args.status, from_database=args.from_database)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_run_dry_run(args: argparse.Namespace, configuration: Configuration, repository: Repository,
 | 
			
		||||
@ -156,7 +158,19 @@ def test_extract_packages(application: Application, mocker: MockerFixture) -> No
 | 
			
		||||
    must extract packages from database
 | 
			
		||||
    """
 | 
			
		||||
    packages_mock = mocker.patch("ahriman.core.repository.repository.Repository.packages")
 | 
			
		||||
    Rebuild.extract_packages(application, from_database=False)
 | 
			
		||||
    Rebuild.extract_packages(application, None, from_database=False)
 | 
			
		||||
    packages_mock.assert_called_once_with()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_extract_packages_by_status(application: Application, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must extract packages from database and filter them by status
 | 
			
		||||
    """
 | 
			
		||||
    packages_mock = mocker.patch("ahriman.core.database.SQLite.packages_get", return_value=[
 | 
			
		||||
        ("package1", BuildStatus(BuildStatusEnum.Success)),
 | 
			
		||||
        ("package2", BuildStatus(BuildStatusEnum.Failed)),
 | 
			
		||||
    ])
 | 
			
		||||
    assert Rebuild.extract_packages(application, BuildStatusEnum.Failed, from_database=True) == ["package2"]
 | 
			
		||||
    packages_mock.assert_called_once_with()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -165,5 +179,5 @@ def test_extract_packages_from_database(application: Application, mocker: Mocker
 | 
			
		||||
    must extract packages from database
 | 
			
		||||
    """
 | 
			
		||||
    packages_mock = mocker.patch("ahriman.core.database.SQLite.packages_get")
 | 
			
		||||
    Rebuild.extract_packages(application, from_database=True)
 | 
			
		||||
    Rebuild.extract_packages(application, None, from_database=True)
 | 
			
		||||
    packages_mock.assert_called_once_with()
 | 
			
		||||
 | 
			
		||||
@ -451,6 +451,14 @@ def test_subparsers_repo_rebuild_architecture(parser: argparse.ArgumentParser) -
 | 
			
		||||
    assert args.architecture == ["x86_64"]
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_repo_rebuild_option_status(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    repo-rebuild command must convert status option to BuildStatusEnum instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "repo-rebuild", "--status", "failed"])
 | 
			
		||||
    assert isinstance(args.status, BuildStatusEnum)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_repo_remove_unknown_architecture(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    repo-remove-unknown command must correctly parse architecture list
 | 
			
		||||
@ -524,7 +532,7 @@ def test_subparsers_repo_status_update(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
 | 
			
		||||
def test_subparsers_repo_status_update_option_status(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    repo-status-update command must convert status option to buildstatusenum instance
 | 
			
		||||
    repo-status-update command must convert status option to BuildStatusEnum instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "repo-status-update"])
 | 
			
		||||
    assert isinstance(args.status, BuildStatusEnum)
 | 
			
		||||
@ -691,7 +699,7 @@ def test_subparsers_service_setup_option_from_configuration(parser: argparse.Arg
 | 
			
		||||
 | 
			
		||||
def test_subparsers_service_setup_option_sign_target(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    service-setup command must convert sign-target option to signsettings instance
 | 
			
		||||
    service-setup command must convert sign-target option to SignSettings instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "service-setup", "--packager", "John Doe <john@doe.com>",
 | 
			
		||||
                              "--repository", "aur-clone", "--sign-target", "packages"])
 | 
			
		||||
@ -730,7 +738,7 @@ def test_subparsers_user_add_architecture(parser: argparse.ArgumentParser) -> No
 | 
			
		||||
 | 
			
		||||
def test_subparsers_user_add_option_role(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    user-add command must convert role option to useraccess instance
 | 
			
		||||
    user-add command must convert role option to UserAccess instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["user-add", "username"])
 | 
			
		||||
    assert isinstance(args.role, UserAccess)
 | 
			
		||||
@ -762,7 +770,7 @@ def test_subparsers_user_list_architecture(parser: argparse.ArgumentParser) -> N
 | 
			
		||||
 | 
			
		||||
def test_subparsers_user_list_option_role(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    user-list command must convert role option to useraccess instance
 | 
			
		||||
    user-list command must convert role option to UserAccess instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["user-list", "--role", "full"])
 | 
			
		||||
    assert isinstance(args.role, UserAccess)
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user