mirror of
				https://github.com/arcan1s/ahriman.git
				synced 2025-11-04 07:43:42 +00:00 
			
		
		
		
	Feature/all archs (#21)
* add init subcommand * add also init command to repository object * add ability to generate list of architectures * check if architecture list is not empty
This commit is contained in:
		@ -6,6 +6,7 @@ from pytest_mock import MockerFixture
 | 
			
		||||
 | 
			
		||||
from ahriman.application.handlers import Handler
 | 
			
		||||
from ahriman.core.configuration import Configuration
 | 
			
		||||
from ahriman.core.exceptions import MissingArchitecture
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_call(args: argparse.Namespace, mocker: MockerFixture) -> None:
 | 
			
		||||
@ -43,7 +44,52 @@ def test_execute(args: argparse.Namespace, mocker: MockerFixture) -> None:
 | 
			
		||||
    starmap_mock.assert_called_once()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_packages(args: argparse.Namespace, configuration: Configuration) -> None:
 | 
			
		||||
def test_extract_architectures(args: argparse.Namespace, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must generate list of available architectures
 | 
			
		||||
    """
 | 
			
		||||
    args.architecture = []
 | 
			
		||||
    args.configuration = Path("")
 | 
			
		||||
    mocker.patch("ahriman.core.configuration.Configuration.getpath")
 | 
			
		||||
    known_architectures_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.known_architectures")
 | 
			
		||||
 | 
			
		||||
    Handler.extract_architectures(args)
 | 
			
		||||
    known_architectures_mock.assert_called_once()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_extract_architectures_empty(args: argparse.Namespace, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must raise exception if no available architectures found
 | 
			
		||||
    """
 | 
			
		||||
    args.architecture = []
 | 
			
		||||
    args.command = "config"
 | 
			
		||||
    args.configuration = Path("")
 | 
			
		||||
    mocker.patch("ahriman.core.configuration.Configuration.getpath")
 | 
			
		||||
    mocker.patch("ahriman.models.repository_paths.RepositoryPaths.known_architectures", return_value=set())
 | 
			
		||||
 | 
			
		||||
    with pytest.raises(MissingArchitecture):
 | 
			
		||||
        Handler.extract_architectures(args)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_extract_architectures_exception(args: argparse.Namespace) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must raise exception on missing architectures
 | 
			
		||||
    """
 | 
			
		||||
    args.command = "config"
 | 
			
		||||
    args.architecture = None
 | 
			
		||||
    with pytest.raises(MissingArchitecture):
 | 
			
		||||
        Handler.extract_architectures(args)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_extract_architectures_specified(args: argparse.Namespace) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must return architecture list if it has been specified
 | 
			
		||||
    """
 | 
			
		||||
    architectures = args.architecture = ["i686", "x86_64"]
 | 
			
		||||
    assert Handler.extract_architectures(args) == set(architectures)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_run(args: argparse.Namespace, configuration: Configuration) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must raise NotImplemented for missing method
 | 
			
		||||
    """
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										18
									
								
								tests/ahriman/application/handlers/test_handler_init.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										18
									
								
								tests/ahriman/application/handlers/test_handler_init.py
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,18 @@
 | 
			
		||||
import argparse
 | 
			
		||||
 | 
			
		||||
from pytest_mock import MockerFixture
 | 
			
		||||
 | 
			
		||||
from ahriman.application.handlers import Init
 | 
			
		||||
from ahriman.core.configuration import Configuration
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_run(args: argparse.Namespace, configuration: Configuration, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must run command
 | 
			
		||||
    """
 | 
			
		||||
    create_tree_mock = mocker.patch("ahriman.models.repository_paths.RepositoryPaths.create_tree")
 | 
			
		||||
    init_mock = mocker.patch("ahriman.core.alpm.repo.Repo.init")
 | 
			
		||||
 | 
			
		||||
    Init.run(args, "x86_64", configuration)
 | 
			
		||||
    create_tree_mock.assert_called_once()
 | 
			
		||||
    init_mock.assert_called_once()
 | 
			
		||||
@ -29,9 +29,9 @@ def test_parser_option_lock(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must convert lock option to Path instance
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "update"])
 | 
			
		||||
    args = parser.parse_args(["update"])
 | 
			
		||||
    assert isinstance(args.lock, Path)
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "-l", "ahriman.lock", "update"])
 | 
			
		||||
    args = parser.parse_args(["-l", "ahriman.lock", "update"])
 | 
			
		||||
    assert isinstance(args.lock, Path)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -43,11 +43,20 @@ def test_multiple_architectures(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    assert len(args.architecture) == 2
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_add(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    add command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["add", "ahriman"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_check(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    check command must imply no_aur, no_manual and dry_run
 | 
			
		||||
    check command must imply empty architecture list, no-aur, no-manual and dry-run
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "check"])
 | 
			
		||||
    args = parser.parse_args(["check"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
    assert not args.no_aur
 | 
			
		||||
    assert args.no_manual
 | 
			
		||||
    assert args.dry_run
 | 
			
		||||
@ -55,38 +64,73 @@ def test_subparsers_check(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
 | 
			
		||||
def test_subparsers_clean(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    clean command must imply unsafe and no-log
 | 
			
		||||
    clean command must imply empty architectures list, unsafe and no-log
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "clean"])
 | 
			
		||||
    args = parser.parse_args(["clean"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
    assert args.no_log
 | 
			
		||||
    assert args.unsafe
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_config(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    config command must imply lock, no_log, no_report and unsafe
 | 
			
		||||
    config command must imply lock, no-log, no-report and unsafe
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "config"])
 | 
			
		||||
    args = parser.parse_args(["config"])
 | 
			
		||||
    assert args.lock is None
 | 
			
		||||
    assert args.no_log
 | 
			
		||||
    assert args.no_report
 | 
			
		||||
    assert args.unsafe
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_init(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    init command must imply no_report
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["init"])
 | 
			
		||||
    assert args.no_report
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_key_import(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    key-import command must imply lock and no_report
 | 
			
		||||
    key-import command must imply architecture list, lock and no-report
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "key-import", "key"])
 | 
			
		||||
    args = parser.parse_args(["key-import", "key"])
 | 
			
		||||
    assert args.architecture == [""]
 | 
			
		||||
    assert args.lock is None
 | 
			
		||||
    assert args.no_report
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_rebuild(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    rebuild command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["rebuild"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_remove(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    remove command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["remove", "ahriman"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_report(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    report command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["report"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_search(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    search command must imply lock, no_log, no_report and unsafe
 | 
			
		||||
    search command must imply architecture list, lock, no-log, no-report and unsafe
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "search", "ahriman"])
 | 
			
		||||
    args = parser.parse_args(["search", "ahriman"])
 | 
			
		||||
    assert args.architecture == [""]
 | 
			
		||||
    assert args.lock is None
 | 
			
		||||
    assert args.no_log
 | 
			
		||||
    assert args.no_report
 | 
			
		||||
@ -95,7 +139,7 @@ def test_subparsers_search(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
 | 
			
		||||
def test_subparsers_setup(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    setup command must imply lock, no_log, no_report and unsafe
 | 
			
		||||
    setup command must imply lock, no-log, no-report and unsafe
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "setup", "--packager", "John Doe <john@doe.com>",
 | 
			
		||||
                              "--repository", "aur-clone"])
 | 
			
		||||
@ -127,9 +171,17 @@ def test_subparsers_setup_option_sign_target(parser: argparse.ArgumentParser) ->
 | 
			
		||||
    assert all(isinstance(target, SignSettings) for target in args.sign_target)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_sign(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    sign command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["sign"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_status(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    status command must imply lock, no_log, no_report and unsafe
 | 
			
		||||
    status command must imply lock, no-log, no-report and unsafe
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "status"])
 | 
			
		||||
    assert args.lock is None
 | 
			
		||||
@ -140,7 +192,7 @@ def test_subparsers_status(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
 | 
			
		||||
def test_subparsers_status_update(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    status-update command must imply lock, no_log, no_report and unsafe
 | 
			
		||||
    status-update command must imply lock, no-log, no-report and unsafe
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["-a", "x86_64", "status-update"])
 | 
			
		||||
    assert args.lock is None
 | 
			
		||||
@ -159,6 +211,22 @@ def test_subparsers_status_update_option_status(parser: argparse.ArgumentParser)
 | 
			
		||||
    assert isinstance(args.status, BuildStatusEnum)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_sync(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    sync command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["sync"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_update(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    update command must imply empty architectures list
 | 
			
		||||
    """
 | 
			
		||||
    args = parser.parse_args(["update"])
 | 
			
		||||
    assert args.architecture == []
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_subparsers_web(parser: argparse.ArgumentParser) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    web command must imply lock and no_report
 | 
			
		||||
 | 
			
		||||
@ -24,6 +24,17 @@ def test_repo_add(repo: Repo, mocker: MockerFixture) -> None:
 | 
			
		||||
    assert check_output_mock.call_args[0][0] == "repo-add"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_repo_init(repo: Repo, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must call repo-add with empty package list on repo initializing
 | 
			
		||||
    """
 | 
			
		||||
    check_output_mock = mocker.patch("ahriman.core.alpm.repo.Repo._check_output")
 | 
			
		||||
 | 
			
		||||
    repo.init()
 | 
			
		||||
    check_output_mock.assert_called_once()
 | 
			
		||||
    assert check_output_mock.call_args[0][0] == "repo-add"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_repo_remove(repo: Repo, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must call repo-remove on package addition
 | 
			
		||||
 | 
			
		||||
@ -4,6 +4,15 @@ from unittest import mock
 | 
			
		||||
from ahriman.models.repository_paths import RepositoryPaths
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_known_architectures(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must list available directory paths
 | 
			
		||||
    """
 | 
			
		||||
    iterdir_mock = mocker.patch("pathlib.Path.iterdir")
 | 
			
		||||
    repository_paths.known_architectures(repository_paths.root)
 | 
			
		||||
    iterdir_mock.assert_called_once()
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def test_create_tree(repository_paths: RepositoryPaths, mocker: MockerFixture) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must create whole tree
 | 
			
		||||
@ -11,7 +20,7 @@ def test_create_tree(repository_paths: RepositoryPaths, mocker: MockerFixture) -
 | 
			
		||||
    paths = {
 | 
			
		||||
        prop
 | 
			
		||||
        for prop in dir(repository_paths)
 | 
			
		||||
        if not prop.startswith("_") and prop not in ("architecture", "create_tree", "root")
 | 
			
		||||
        if not prop.startswith("_") and prop not in ("architecture", "create_tree", "known_architectures", "root")
 | 
			
		||||
    }
 | 
			
		||||
    mkdir_mock = mocker.patch("pathlib.Path.mkdir")
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -8,7 +8,7 @@ from ahriman.models.package import Package
 | 
			
		||||
 | 
			
		||||
async def test_get(client: TestClient, package_ahriman: Package) -> None:
 | 
			
		||||
    """
 | 
			
		||||
    must generate web service status correctly)
 | 
			
		||||
    must generate web service status correctly
 | 
			
		||||
    """
 | 
			
		||||
    await client.post(f"/api/v1/packages/{package_ahriman.base}",
 | 
			
		||||
                      json={"status": BuildStatusEnum.Success.value, "package": package_ahriman.view()})
 | 
			
		||||
 | 
			
		||||
		Reference in New Issue
	
	Block a user