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

check log record in handler instead of client

Browse Source
This commit is contained in:
Evgenii Alekseev
2022-11-22 02:28:52 +02:00
parent 78e6b48c24
commit 3bca780bdd
6 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/ahriman/core/log/test_http_log_handler.py
View File

@ -4,6 +4,7 @@ from pytest_mock import MockerFixture
from ahriman.core.configuration import Configuration
from ahriman.core.log.http_log_handler import HttpLogHandler
from ahriman.models.package import Package
def test_load(configuration: Configuration, mocker: MockerFixture) -> None:
@ -33,24 +34,40 @@ def test_load_exist(configuration: Configuration) -> None:
assert handler is new_handler
def test_emit(configuration: Configuration, log_record: logging.LogRecord, mocker: MockerFixture) -> None:
def test_emit(configuration: Configuration, log_record: logging.LogRecord, package_ahriman: Package,
mocker: MockerFixture) -> None:
"""
must emit log record to reporter
"""
log_record.package_base = package_ahriman.base
log_mock = mocker.patch("ahriman.core.status.client.Client.logs")
handler = HttpLogHandler(configuration, report=False)
handler.emit(log_record)
log_mock.assert_called_once_with(log_record)
log_mock.assert_called_once_with(package_ahriman.base, log_record)
def test_emit_failed(configuration: Configuration, log_record: logging.LogRecord, mocker: MockerFixture) -> None:
def test_emit_failed(configuration: Configuration, log_record: logging.LogRecord, package_ahriman: Package,
mocker: MockerFixture) -> None:
"""
must call handle error on exception
"""
log_record.package_base = package_ahriman.base
mocker.patch("ahriman.core.status.client.Client.logs", side_effect=Exception())
handle_error_mock = mocker.patch("logging.Handler.handleError")
handler = HttpLogHandler(configuration, report=False)
handler.emit(log_record)
handle_error_mock.assert_called_once_with(log_record)
def test_emit_skip(configuration: Configuration, log_record: logging.LogRecord, mocker: MockerFixture) -> None:
"""
must skip log record posting if no package base set
"""
log_mock = mocker.patch("ahriman.core.status.client.Client.logs")
handler = HttpLogHandler(configuration, report=False)
handler.emit(log_record)
log_mock.assert_not_called()

4
tests/ahriman/core/status/test_client.py
View File

@ -68,11 +68,11 @@ def test_get_internal(client: Client) -> None:
assert actual == expected
def test_log(client: Client, log_record: logging.LogRecord) -> None:
def test_log(client: Client, package_ahriman: Package, log_record: logging.LogRecord) -> None:
"""
must process log record without errors
"""
client.logs(log_record)
client.logs(package_ahriman.base, log_record)
def test_remove(client: Client, package_ahriman: Package) -> None:

16
tests/ahriman/core/status/test_web_client.py
View File

@ -14,7 +14,7 @@ from ahriman.models.package import Package
from ahriman.models.user import User
def test_status_url(web_client: WebClient) -> None:
def test_login_url(web_client: WebClient) -> None:
"""
must generate login url correctly
"""
@ -215,14 +215,13 @@ def test_logs(web_client: WebClient, log_record: logging.LogRecord, package_ahri
must process log record
"""
requests_mock = mocker.patch("requests.Session.post")
log_record.package_base = package_ahriman.base
payload = {
"created": log_record.created,
"message": log_record.getMessage(),
"process_id": log_record.process,
}
web_client.logs(log_record)
web_client.logs(package_ahriman.base, log_record)
requests_mock.assert_called_once_with(pytest.helpers.anyvar(str, True), json=payload)
@ -234,16 +233,7 @@ def test_log_failed(web_client: WebClient, log_record: logging.LogRecord, packag
mocker.patch("requests.Session.post", side_effect=Exception())
log_record.package_base = package_ahriman.base
with pytest.raises(Exception):
web_client.logs(log_record)
def test_log_skip(web_client: WebClient, log_record: logging.LogRecord, mocker: MockerFixture) -> None:
"""
must skip log record posting if no package base set
"""
requests_mock = mocker.patch("requests.Session.post")
web_client.logs(log_record)
requests_mock.assert_not_called()
web_client.logs(package_ahriman.base, log_record)
def test_remove(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None: