Merge f552fa1a33e76d99e038d3abbbe8014c84149023 into ac19c407d3423e9f95a408e608e434314ac87b8b

src/ahriman/application/application/application_properties.py

@@ -21,7 +21,7 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.log import LazyLogging
 from ahriman.core.repository import Repository
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.pacman_synchronization import PacmanSynchronization
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/application/lock.py

@@ -27,7 +27,7 @@ from ahriman import __version__
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import DuplicateRunError
 from ahriman.core.log import LazyLogging
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.util import check_user
 from ahriman.models.build_status import BuildStatusEnum
 from ahriman.models.repository_id import RepositoryId

src/ahriman/core/database/operations/operations.py

@@ -27,7 +27,6 @@ from ahriman.core.log import LazyLogging
 from ahriman.models.repository_id import RepositoryId
 from ahriman.models.repository_paths import RepositoryPaths
 
-
 T = TypeVar("T")
 
 

src/ahriman/core/gitremote/remote_push.py

@@ -27,7 +27,7 @@ from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
 from ahriman.core.exceptions import GitRemoteError
 from ahriman.core.log import LazyLogging
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.package import Package
 from ahriman.models.package_source import PackageSource
 from ahriman.models.remote_source import RemoteSource

src/ahriman/core/gitremote/remote_push_trigger.py

@@ -20,7 +20,7 @@
 from ahriman.core import context
 from ahriman.core.configuration import Configuration
 from ahriman.core.gitremote.remote_push import RemotePush
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.triggers import Trigger
 from ahriman.models.package import Package
 from ahriman.models.repository_id import RepositoryId

src/ahriman/core/log/http_log_handler.py

@@ -50,7 +50,7 @@ class HttpLogHandler(logging.Handler):
         logging.Handler.__init__(self)
 
         # client has to be imported here because of circular imports
-        from ahriman.core.status import Client
+        from ahriman.core.status.client import Client
         self.reporter = Client.load(repository_id, configuration, report=report)
         self.suppress_errors = suppress_errors
 

src/ahriman/core/repository/repository.py

@@ -26,7 +26,7 @@ from ahriman.core.database import SQLite
 from ahriman.core.repository.executor import Executor
 from ahriman.core.repository.update_handler import UpdateHandler
 from ahriman.core.sign.gpg import GPG
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.pacman_synchronization import PacmanSynchronization
 from ahriman.models.repository_id import RepositoryId
 

src/ahriman/core/repository/repository_properties.py

@@ -23,7 +23,7 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.log import LazyLogging
 from ahriman.core.sign.gpg import GPG
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.triggers import TriggerLoader
 from ahriman.models.packagers import Packagers
 from ahriman.models.pacman_synchronization import PacmanSynchronization

src/ahriman/core/status/__init__.py

@@ -17,4 +17,3 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-from ahriman.core.status.client import Client

src/ahriman/core/status/local_client.py

@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
 from ahriman.core.database import SQLite
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 from ahriman.models.changes import Changes
 from ahriman.models.dependencies import Dependencies

src/ahriman/core/status/watcher.py

@@ -21,7 +21,7 @@ from threading import Lock
 
 from ahriman.core.exceptions import UnknownPackageError
 from ahriman.core.log import LazyLogging
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 from ahriman.models.changes import Changes
 from ahriman.models.dependencies import Dependencies

src/ahriman/core/status/web_client.py

@@ -23,7 +23,7 @@ from urllib.parse import quote_plus as urlencode
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.http import SyncAhrimanClient
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
 from ahriman.models.changes import Changes
 from ahriman.models.dependencies import Dependencies

src/ahriman/core/support/package_creator.py

@@ -24,7 +24,7 @@ from pathlib import Path
 from ahriman.core import context
 from ahriman.core.build_tools.sources import Sources
 from ahriman.core.configuration import Configuration
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.support.pkgbuild.pkgbuild_generator import PkgbuildGenerator
 from ahriman.models.package import Package
 

src/ahriman/web/views/v1/packages/changes.py

@@ -86,7 +86,7 @@ class ChangesView(StatusViewGuard, BaseView):
             400: {"description": "Bad data is supplied", "schema": ErrorSchema},
             401: {"description": "Authorization required", "schema": ErrorSchema},
             403: {"description": "Access is forbidden", "schema": ErrorSchema},
-            404: {"description": "Package base and/or repository are unknown", "schema": ErrorSchema},
+            404: {"description": "Repository is unknown", "schema": ErrorSchema},
             500: {"description": "Internal server error", "schema": ErrorSchema},
         },
         security=[{"token": [POST_PERMISSION]}],
@@ -113,9 +113,6 @@ class ChangesView(StatusViewGuard, BaseView):
             raise HTTPBadRequest(reason=str(ex))
 
         changes = Changes(last_commit_sha, change)
-        try:
+        self.service().package_changes_update(package_base, changes)
-            self.service().package_changes_update(package_base, changes)
-        except UnknownPackageError:
-            raise HTTPNotFound(reason=f"Package {package_base} is unknown")
 
         raise HTTPNoContent

src/ahriman/web/web.py

@@ -30,7 +30,7 @@ from ahriman.core.database import SQLite
 from ahriman.core.distributed import WorkersCache
 from ahriman.core.exceptions import InitializeError
 from ahriman.core.spawn import Spawn
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.repository_id import RepositoryId
 from ahriman.web.apispec import setup_apispec

tests/ahriman/application/application/test_application.py

@@ -93,7 +93,7 @@ def test_with_dependencies(application: Application, package_ahriman: Package, p
                                       side_effect=lambda *args: packages[args[0].name])
     packages_mock = mocker.patch("ahriman.application.application.Application._known_packages",
                                  return_value={"devtools", "python-build", "python-pytest"})
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_unknown")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_unknown")
 
     result = application.with_dependencies([package_ahriman], process_dependencies=True)
     assert {package.base: package for package in result} == packages

tests/ahriman/application/application/test_application_packages.py

@@ -41,7 +41,7 @@ def test_add_aur(application_packages: ApplicationPackages, package_ahriman: Pac
     """
     mocker.patch("ahriman.models.package.Package.from_aur", return_value=package_ahriman)
     build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_insert")
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_unknown")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_unknown")
 
     application_packages._add_aur(package_ahriman.base, "packager")
     build_queue_mock.assert_called_once_with(package_ahriman)
@@ -153,7 +153,7 @@ def test_add_repository(application_packages: ApplicationPackages, package_ahrim
     """
     mocker.patch("ahriman.models.package.Package.from_official", return_value=package_ahriman)
     build_queue_mock = mocker.patch("ahriman.core.database.SQLite.build_queue_insert")
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_unknown")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_unknown")
 
     application_packages._add_repository(package_ahriman.base, "packager")
     build_queue_mock.assert_called_once_with(package_ahriman)

tests/ahriman/application/handlers/test_handler_patch.py

@@ -171,26 +171,11 @@ def test_patch_set_list(application: Application, mocker: MockerFixture) -> None
     check_mock.assert_called_once_with(False, False)
 
 
-def test_patch_set_list_all(application: Application, mocker: MockerFixture) -> None:
-    """
-    must list all available patches for the command
-    """
-    get_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_patches_get",
-                            return_value=[PkgbuildPatch(None, "patch")])
-    print_mock = mocker.patch("ahriman.core.formatters.Printer.print")
-    check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
-
-    Patch.patch_set_list(application, "ahriman", None, False)
-    get_mock.assert_called_once_with("ahriman", None)
-    print_mock.assert_called_once_with(verbose=True, log_fn=pytest.helpers.anyvar(int), separator=" = ")
-    check_mock.assert_called_once_with(False, False)
-
-
 def test_patch_set_list_empty_exception(application: Application, mocker: MockerFixture) -> None:
     """
     must raise ExitCode exception on empty patch list
     """
-    mocker.patch("ahriman.core.status.local_client.LocalClient.package_patches_get", return_value={})
+    mocker.patch("ahriman.core.database.SQLite.patches_list", return_value={})
     check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 
     Patch.patch_set_list(application, "ahriman", [], True)
@@ -201,27 +186,18 @@ def test_patch_set_create(application: Application, package_ahriman: Package, mo
     """
     must create patch set for the package
     """
-    create_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_patches_update")
+    create_mock = mocker.patch("ahriman.core.database.SQLite.patches_insert")
     Patch.patch_set_create(application, package_ahriman.base, PkgbuildPatch("version", package_ahriman.version))
-    create_mock.assert_called_once_with(package_ahriman.base, PkgbuildPatch("version", package_ahriman.version))
+    create_mock.assert_called_once_with(package_ahriman.base, [PkgbuildPatch("version", package_ahriman.version)])
 
 
 def test_patch_set_remove(application: Application, package_ahriman: Package, mocker: MockerFixture) -> None:
     """
     must remove patch set for the package
     """
-    remove_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_patches_remove")
+    remove_mock = mocker.patch("ahriman.core.database.SQLite.patches_remove")
     Patch.patch_set_remove(application, package_ahriman.base, ["version"])
-    remove_mock.assert_called_once_with(package_ahriman.base, "version")
+    remove_mock.assert_called_once_with(package_ahriman.base, ["version"])
-
-
-def test_patch_set_remove_all(application: Application, package_ahriman: Package, mocker: MockerFixture) -> None:
-    """
-    must remove all patches for the package
-    """
-    remove_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_patches_remove")
-    Patch.patch_set_remove(application, package_ahriman.base, None)
-    remove_mock.assert_called_once_with(package_ahriman.base, None)
 
 
 def test_disallow_multi_architecture_run() -> None:

tests/ahriman/application/handlers/test_handler_status.py

@@ -37,7 +37,7 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository:
     """
     args = _default_args(args)
     mocker.patch("ahriman.core.repository.Repository.load", return_value=repository)
-    application_mock = mocker.patch("ahriman.core.status.Client.status_get")
+    application_mock = mocker.patch("ahriman.core.status.client.Client.status_get")
     packages_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_get",
                                  return_value=[(package_ahriman, BuildStatus(BuildStatusEnum.Success)),
                                                (package_python_schedule, BuildStatus(BuildStatusEnum.Failed))])
@@ -63,7 +63,7 @@ def test_run_empty_exception(args: argparse.Namespace, configuration: Configurat
     args = _default_args(args)
     args.exit_code = True
     mocker.patch("ahriman.core.repository.Repository.load", return_value=repository)
-    mocker.patch("ahriman.core.status.Client.status_get")
+    mocker.patch("ahriman.core.status.client.Client.status_get")
     mocker.patch("ahriman.core.status.local_client.LocalClient.package_get", return_value=[])
     check_mock = mocker.patch("ahriman.application.handlers.Handler.check_if_empty")
 

tests/ahriman/application/handlers/test_handler_status_update.py

@@ -41,21 +41,6 @@ def test_run(args: argparse.Namespace, configuration: Configuration, repository:
     update_self_mock.assert_called_once_with(args.status)
 
 
-def test_run_packages(args: argparse.Namespace, configuration: Configuration, repository: Repository,
-                      mocker: MockerFixture) -> None:
-    """
-    must run command with specified packages
-    """
-    args = _default_args(args)
-    args.package = ["package"]
-    mocker.patch("ahriman.core.repository.Repository.load", return_value=repository)
-    update_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_update")
-
-    _, repository_id = configuration.check_loaded()
-    StatusUpdate.run(args, repository_id, configuration, report=False)
-    update_mock.assert_called_once_with("package", args.status)
-
-
 def test_run_remove(args: argparse.Namespace, configuration: Configuration, repository: Repository,
                     package_ahriman: Package, mocker: MockerFixture) -> None:
     """

tests/ahriman/application/test_lock.py

@@ -64,7 +64,7 @@ def test_check_version(lock: Lock, mocker: MockerFixture) -> None:
     """
     must check version correctly
     """
-    mocker.patch("ahriman.core.status.Client.status_get",
+    mocker.patch("ahriman.core.status.client.Client.status_get",
                  return_value=InternalStatus(status=BuildStatus(), version=__version__))
     logging_mock = mocker.patch("logging.Logger.warning")
 
@@ -76,7 +76,7 @@ def test_check_version_mismatch(lock: Lock, mocker: MockerFixture) -> None:
     """
     must check mismatched version correctly
     """
-    mocker.patch("ahriman.core.status.Client.status_get",
+    mocker.patch("ahriman.core.status.client.Client.status_get",
                  return_value=InternalStatus(status=BuildStatus(), version="version"))
     logging_mock = mocker.patch("logging.Logger.warning")
 
@@ -184,7 +184,7 @@ def test_enter(lock: Lock, mocker: MockerFixture) -> None:
     watch_mock = mocker.patch("ahriman.application.lock.Lock.watch")
     clear_mock = mocker.patch("ahriman.application.lock.Lock.clear")
     create_mock = mocker.patch("ahriman.application.lock.Lock.create")
-    update_status_mock = mocker.patch("ahriman.core.status.Client.status_update")
+    update_status_mock = mocker.patch("ahriman.core.status.client.Client.status_update")
 
     with lock:
         pass
@@ -203,7 +203,7 @@ def test_exit_with_exception(lock: Lock, mocker: MockerFixture) -> None:
     mocker.patch("ahriman.application.lock.Lock.check_user")
     mocker.patch("ahriman.application.lock.Lock.clear")
     mocker.patch("ahriman.application.lock.Lock.create")
-    update_status_mock = mocker.patch("ahriman.core.status.Client.status_update")
+    update_status_mock = mocker.patch("ahriman.core.status.client.Client.status_update")
 
     with pytest.raises(Exception):
         with lock:

tests/ahriman/conftest.py

@@ -13,7 +13,7 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository
 from ahriman.core.spawn import Spawn
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.status.watcher import Watcher
 from ahriman.models.aur_package import AURPackage
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum

tests/ahriman/core/gitremote/test_remote_push.py

@@ -7,7 +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_push import RemotePush
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.package import Package
 from ahriman.models.pkgbuild_patch import PkgbuildPatch
 from ahriman.models.result import Result

tests/ahriman/core/gitremote/test_remote_push_trigger.py

@@ -2,7 +2,7 @@ from pytest_mock import MockerFixture
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.gitremote import RemotePushTrigger
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.models.package import Package
 from ahriman.models.result import Result
 

tests/ahriman/core/log/test_http_log_handler.py

@@ -18,7 +18,7 @@ def test_load(configuration: Configuration, mocker: MockerFixture) -> None:
     root.removeHandler(current_handler)
 
     add_mock = mocker.patch("logging.Logger.addHandler")
-    load_mock = mocker.patch("ahriman.core.status.Client.load")
+    load_mock = mocker.patch("ahriman.core.status.client.Client.load")
 
     _, repository_id = configuration.check_loaded()
     handler = HttpLogHandler.load(repository_id, configuration, report=False)
@@ -43,7 +43,7 @@ def test_emit(configuration: Configuration, log_record: logging.LogRecord, packa
     must emit log record to reporter
     """
     log_record_id = log_record.package_id = LogRecordId(package_ahriman.base, package_ahriman.version)
-    log_mock = mocker.patch("ahriman.core.status.Client.package_logs_add")
+    log_mock = mocker.patch("ahriman.core.status.client.Client.package_logs_add")
 
     _, repository_id = configuration.check_loaded()
     handler = HttpLogHandler(repository_id, configuration, report=False, suppress_errors=False)
@@ -58,7 +58,7 @@ def test_emit_failed(configuration: Configuration, log_record: logging.LogRecord
     must call handle error on exception
     """
     log_record.package_id = LogRecordId(package_ahriman.base, package_ahriman.version)
-    mocker.patch("ahriman.core.status.Client.package_logs_add", side_effect=Exception())
+    mocker.patch("ahriman.core.status.client.Client.package_logs_add", side_effect=Exception())
     handle_error_mock = mocker.patch("logging.Handler.handleError")
     _, repository_id = configuration.check_loaded()
     handler = HttpLogHandler(repository_id, configuration, report=False, suppress_errors=False)
@@ -73,7 +73,7 @@ def test_emit_suppress_failed(configuration: Configuration, log_record: logging.
     must not call handle error on exception if suppress flag is set
     """
     log_record.package_id = LogRecordId(package_ahriman.base, package_ahriman.version)
-    mocker.patch("ahriman.core.status.Client.package_logs_add", side_effect=Exception())
+    mocker.patch("ahriman.core.status.client.Client.package_logs_add", side_effect=Exception())
     handle_error_mock = mocker.patch("logging.Handler.handleError")
     _, repository_id = configuration.check_loaded()
     handler = HttpLogHandler(repository_id, configuration, report=False, suppress_errors=True)
@@ -86,7 +86,7 @@ def test_emit_skip(configuration: Configuration, log_record: logging.LogRecord,
     """
     must skip log record posting if no package base set
     """
-    log_mock = mocker.patch("ahriman.core.status.Client.package_logs_add")
+    log_mock = mocker.patch("ahriman.core.status.client.Client.package_logs_add")
 
     _, repository_id = configuration.check_loaded()
     handler = HttpLogHandler(repository_id, configuration, report=False, suppress_errors=False)

tests/ahriman/core/repository/test_executor.py

@@ -22,7 +22,7 @@ def test_process_build(executor: Executor, package_ahriman: Package, passwd: Any
     mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
     init_mock = mocker.patch("ahriman.core.build_tools.task.Task.init", return_value="sha")
     move_mock = mocker.patch("shutil.move")
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_building")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_building")
     commit_sha_mock = mocker.patch("ahriman.core.status.local_client.LocalClient.package_changes_update")
     depends_on_mock = mocker.patch("ahriman.models.package_archive.PackageArchive.depends_on",
                                    return_value=Dependencies())
@@ -46,6 +46,8 @@ def test_process_build_bump_pkgrel(executor: Executor, package_ahriman: Package,
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
     mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
     mocker.patch("shutil.move")
+    mocker.patch("ahriman.core.status.client.Client.set_building")
+    mocker.patch("ahriman.core.status.client.Client.package_changes_update")
     init_mock = mocker.patch("ahriman.core.build_tools.task.Task.init")
 
     executor.process_build([package_ahriman], Packagers("packager"), bump_pkgrel=True)
@@ -63,7 +65,7 @@ def test_process_build_failure(executor: Executor, package_ahriman: Package, moc
     mocker.patch("ahriman.core.build_tools.task.Task.build", return_value=[Path(package_ahriman.base)])
     mocker.patch("ahriman.core.build_tools.task.Task.init")
     mocker.patch("shutil.move", side_effect=Exception())
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_failed")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_failed")
 
     executor.process_build([package_ahriman])
     status_client_mock.assert_called_once_with(package_ahriman.base)
@@ -193,7 +195,7 @@ def test_process_update(executor: Executor, package_ahriman: Package, user: User
     move_mock = mocker.patch("shutil.move")
     repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
     sign_package_mock = mocker.patch("ahriman.core.sign.gpg.GPG.process_sign_package", side_effect=lambda fn, _: [fn])
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_success")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_success")
     remove_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_remove")
     packager_mock = mocker.patch("ahriman.core.repository.executor.Executor.packager", return_value=user)
     filepath = next(package.filepath for package in package_ahriman.packages.values())
@@ -225,7 +227,7 @@ def test_process_update_group(executor: Executor, package_python_schedule: Packa
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_python_schedule])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_python_schedule])
     repo_add_mock = mocker.patch("ahriman.core.alpm.repo.Repo.add")
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_success")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_success")
     remove_mock = mocker.patch("ahriman.core.repository.executor.Executor.process_remove")
 
     executor.process_update([package.filepath for package in package_python_schedule.packages.values()])
@@ -275,7 +277,7 @@ def test_process_update_failed(executor: Executor, package_ahriman: Package, moc
     mocker.patch("shutil.move", side_effect=Exception())
     mocker.patch("ahriman.core.repository.executor.Executor.load_archives", return_value=[package_ahriman])
     mocker.patch("ahriman.core.repository.executor.Executor.packages", return_value=[package_ahriman])
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_failed")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_failed")
 
     executor.process_update([package.filepath for package in package_ahriman.packages.values()])
     status_client_mock.assert_called_once_with(package_ahriman.base)

tests/ahriman/core/repository/test_repository.py

@@ -6,7 +6,7 @@ from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
 from ahriman.core.repository import Repository
 from ahriman.core.sign.gpg import GPG
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 
 
 def test_load(configuration: Configuration, database: SQLite, mocker: MockerFixture) -> None:

tests/ahriman/core/repository/test_update_handler.py

@@ -20,7 +20,7 @@ def test_updates_aur(update_handler: UpdateHandler, package_ahriman: Package,
     packages_mock = mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages",
                                  return_value=[package_ahriman])
     mocker.patch("ahriman.models.package.Package.from_aur", return_value=package_ahriman)
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_pending")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_pending")
     package_is_outdated_mock = mocker.patch("ahriman.models.package.Package.is_outdated", return_value=True)
 
     assert update_handler.updates_aur([], vcs=True) == [package_ahriman]
@@ -41,7 +41,7 @@ def test_updates_aur_official(update_handler: UpdateHandler, package_ahriman: Pa
     mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman])
     mocker.patch("ahriman.models.package.Package.is_outdated", return_value=True)
     mocker.patch("ahriman.models.package.Package.from_official", return_value=package_ahriman)
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_pending")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_pending")
 
     assert update_handler.updates_aur([], vcs=True) == [package_ahriman]
     status_client_mock.assert_called_once_with(package_ahriman.base)
@@ -54,7 +54,7 @@ def test_updates_aur_failed(update_handler: UpdateHandler, package_ahriman: Pack
     """
     mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman])
     mocker.patch("ahriman.models.package.Package.from_aur", side_effect=Exception())
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_failed")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_failed")
 
     update_handler.updates_aur([], vcs=True)
     status_client_mock.assert_called_once_with(package_ahriman.base)
@@ -141,7 +141,7 @@ def test_updates_aur_load_by_package_failed(update_handler: UpdateHandler, packa
     """
     mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman])
     mocker.patch("ahriman.models.package.Package.from_aur", side_effect=UnknownPackageError(package_ahriman.base))
-    mocker.patch("ahriman.core.status.Client.set_failed")
+    mocker.patch("ahriman.core.status.client.Client.set_failed")
 
     update_handler.updates_aur([], vcs=True)
 
@@ -204,7 +204,7 @@ def test_updates_local(update_handler: UpdateHandler, package_ahriman: Package,
     mocker.patch("pathlib.Path.iterdir", return_value=[Path(package_ahriman.base)])
     fetch_mock = mocker.patch("ahriman.core.build_tools.sources.Sources.fetch")
     package_load_mock = mocker.patch("ahriman.models.package.Package.from_build", return_value=package_ahriman)
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_pending")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_pending")
     package_is_outdated_mock = mocker.patch("ahriman.models.package.Package.is_outdated", return_value=True)
 
     assert update_handler.updates_local(vcs=True) == [package_ahriman]
@@ -280,7 +280,7 @@ def test_updates_manual_status_known(update_handler: UpdateHandler, package_ahri
     """
     mocker.patch("ahriman.core.database.SQLite.build_queue_get", return_value=[package_ahriman])
     mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[package_ahriman])
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_pending")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_pending")
 
     update_handler.updates_manual()
     status_client_mock.assert_called_once_with(package_ahriman.base)
@@ -293,7 +293,7 @@ def test_updates_manual_status_unknown(update_handler: UpdateHandler, package_ah
     """
     mocker.patch("ahriman.core.database.SQLite.build_queue_get", return_value=[package_ahriman])
     mocker.patch("ahriman.core.repository.update_handler.UpdateHandler.packages", return_value=[])
-    status_client_mock = mocker.patch("ahriman.core.status.Client.set_unknown")
+    status_client_mock = mocker.patch("ahriman.core.status.client.Client.set_unknown")
 
     update_handler.updates_manual()
     status_client_mock.assert_called_once_with(package_ahriman)

tests/ahriman/core/status/conftest.py

@@ -1,7 +1,7 @@
 import pytest
 
 from ahriman.core.configuration import Configuration
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.status.web_client import WebClient
 
 

tests/ahriman/core/status/test_client.py

@@ -5,7 +5,7 @@ from pytest_mock import MockerFixture
 
 from ahriman.core.configuration import Configuration
 from ahriman.core.database import SQLite
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.status.local_client import LocalClient
 from ahriman.core.status.web_client import WebClient
 from ahriman.models.build_status import BuildStatus, BuildStatusEnum
@@ -210,7 +210,7 @@ def test_set_building(client: Client, package_ahriman: Package, mocker: MockerFi
     """
     must set building status to the package
     """
-    update_mock = mocker.patch("ahriman.core.status.Client.package_update")
+    update_mock = mocker.patch("ahriman.core.status.client.Client.package_update")
     client.set_building(package_ahriman.base)
 
     update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Building)
@@ -220,7 +220,7 @@ def test_set_failed(client: Client, package_ahriman: Package, mocker: MockerFixt
     """
     must set failed status to the package
     """
-    update_mock = mocker.patch("ahriman.core.status.Client.package_update")
+    update_mock = mocker.patch("ahriman.core.status.client.Client.package_update")
     client.set_failed(package_ahriman.base)
 
     update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Failed)
@@ -230,7 +230,7 @@ def test_set_pending(client: Client, package_ahriman: Package, mocker: MockerFix
     """
     must set building status to the package
     """
-    update_mock = mocker.patch("ahriman.core.status.Client.package_update")
+    update_mock = mocker.patch("ahriman.core.status.client.Client.package_update")
     client.set_pending(package_ahriman.base)
 
     update_mock.assert_called_once_with(package_ahriman.base, BuildStatusEnum.Pending)
@@ -240,7 +240,7 @@ def test_set_success(client: Client, package_ahriman: Package, mocker: MockerFix
     """
     must set success status to the package
     """
-    add_mock = mocker.patch("ahriman.core.status.Client.package_add")
+    add_mock = mocker.patch("ahriman.core.status.client.Client.package_add")
     client.set_success(package_ahriman)
 
     add_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.Success)
@@ -250,7 +250,7 @@ def test_set_unknown(client: Client, package_ahriman: Package, mocker: MockerFix
     """
     must add new package with unknown status
     """
-    add_mock = mocker.patch("ahriman.core.status.Client.package_add")
+    add_mock = mocker.patch("ahriman.core.status.client.Client.package_add")
     client.set_unknown(package_ahriman)
 
     add_mock.assert_called_once_with(package_ahriman, BuildStatusEnum.Unknown)

tests/ahriman/core/support/test_package_creator.py

@@ -1,7 +1,7 @@
 from pathlib import Path
 from pytest_mock import MockerFixture
 
-from ahriman.core.status import Client
+from ahriman.core.status.client import Client
 from ahriman.core.support.package_creator import PackageCreator
 from ahriman.models.package import Package
 from ahriman.models.package_description import PackageDescription
@@ -38,7 +38,7 @@ def test_package_register(package_creator: PackageCreator, mocker: MockerFixture
         packages={package_creator.generator.pkgname: PackageDescription()},
     )
     client_mock = mocker.patch("ahriman.core._Context.get", return_value=Client())
-    insert_mock = mocker.patch("ahriman.core.status.Client.set_unknown")
+    insert_mock = mocker.patch("ahriman.core.status.client.Client.set_unknown")
     package_mock = mocker.patch("ahriman.models.package.Package.from_build", return_value=package)
 
     package_creator.package_register(path)

tests/ahriman/web/views/v1/packages/test_view_v1_packages_changes.py

@@ -82,14 +82,3 @@ async def test_post_exception(client: TestClient, package_ahriman: Package) -> N
     response = await client.post(f"/api/v1/packages/{package_ahriman.base}/changes", json=[])
     assert response.status == 400
     assert not response_schema.validate(await response.json())
-
-
-async def test_post_not_found(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must raise exception on unknown package
-    """
-    response_schema = pytest.helpers.schema_response(ChangesView.post, code=404)
-
-    response = await client.post(f"/api/v1/packages/{package_ahriman.base}/changes", json={})
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())

tests/ahriman/web/views/v1/packages/test_view_v1_packages_dependencies.py

@@ -46,17 +46,6 @@ async def test_get(client: TestClient, package_ahriman: Package) -> None:
     assert dependencies == dependency.view()
 
 
-async def test_get_not_found(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must return not found for missing package
-    """
-    response_schema = pytest.helpers.schema_response(DependenciesView.get, code=404)
-
-    response = await client.get(f"/api/v1/packages/{package_ahriman.base}/dependencies")
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())
-
-
 async def test_post(client: TestClient, package_ahriman: Package) -> None:
     """
     must create dependencies
@@ -84,14 +73,3 @@ async def test_post_exception(client: TestClient, package_ahriman: Package) -> N
     response = await client.post(f"/api/v1/packages/{package_ahriman.base}/dependencies", json=[])
     assert response.status == 400
     assert not response_schema.validate(await response.json())
-
-
-async def test_post_not_found(client: TestClient, package_ahriman: Package) -> None:
-    """
-    must raise exception on unknown package
-    """
-    response_schema = pytest.helpers.schema_response(DependenciesView.post, code=404)
-
-    response = await client.post(f"/api/v1/packages/{package_ahriman.base}/dependencies", json={})
-    assert response.status == 404
-    assert not response_schema.validate(await response.json())