arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-09-16 21:59:56 +00:00
Code Issues Projects Releases Wiki Activity

make _call method of handlers public and also simplify process spawn

Browse Source
This commit is contained in:
Evgenii Alekseev
2021-09-09 00:35:07 +03:00
parent ea421712a6
commit cafa76f680
4 changed files with 33 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ahriman/application/handlers/test_handler.py
View File

@ -20,7 +20,7 @@ def test_call(args: argparse.Namespace, mocker: MockerFixture) -> None:
enter_mock = mocker.patch("ahriman.application.lock.Lock.__enter__")
exit_mock = mocker.patch("ahriman.application.lock.Lock.__exit__")
assert Handler._call(args, "x86_64")
assert Handler.call(args, "x86_64")
enter_mock.assert_called_once()
exit_mock.assert_called_once()
@ -30,7 +30,7 @@ def test_call_exception(args: argparse.Namespace, mocker: MockerFixture) -> None
must process exception
"""
mocker.patch("ahriman.application.lock.Lock.__enter__", side_effect=Exception())
assert not Handler._call(args, "x86_64")
assert not Handler.call(args, "x86_64")
def test_execute(args: argparse.Namespace, mocker: MockerFixture) -> None:

32
tests/ahriman/core/test_spawn.py
View File

@ -9,15 +9,15 @@ def test_process(spawner: Spawn) -> None:
must process external process run correctly
"""
args = MagicMock()
args.no_report = False
callback = MagicMock()
callback.return_value = True
spawner.process(callback, args, spawner.architecture, spawner.configuration, "id", spawner.queue)
spawner.process(callback, args, spawner.architecture, "id", spawner.queue)
callback.assert_called_with(args, spawner.architecture, spawner.configuration, False)
(uuid, error) = spawner.queue.get()
callback.assert_called_with(args, spawner.architecture)
(uuid, status) = spawner.queue.get()
assert uuid == "id"
assert error is None
assert status
assert spawner.queue.empty()
@ -26,13 +26,13 @@ def test_process_error(spawner: Spawn) -> None:
must process external run with error correctly
"""
callback = MagicMock()
callback.side_effect = Exception()
callback.return_value = False
spawner.process(callback, MagicMock(), spawner.architecture, spawner.configuration, "id", spawner.queue)
spawner.process(callback, MagicMock(), spawner.architecture, "id", spawner.queue)
(uuid, error) = spawner.queue.get()
(uuid, status) = spawner.queue.get()
assert uuid == "id"
assert isinstance(error, Exception)
assert not status
assert spawner.queue.empty()
@ -90,16 +90,14 @@ def test_run(spawner: Spawn, mocker: MockerFixture) -> None:
"""
must implement run method
"""
logging_exception_mock = mocker.patch("logging.Logger.exception")
logging_info_mock = mocker.patch("logging.Logger.info")
logging_mock = mocker.patch("logging.Logger.info")
spawner.queue.put(("1", None))
spawner.queue.put(("2", Exception()))
spawner.queue.put(("1", False))
spawner.queue.put(("2", True))
spawner.queue.put(None) # terminate
spawner.run()
logging_exception_mock.assert_called_once()
logging_info_mock.assert_called_once()
logging_mock.assert_called()
def test_run_pop(spawner: Spawn) -> None:
@ -109,8 +107,8 @@ def test_run_pop(spawner: Spawn) -> None:
first = spawner.active["1"] = MagicMock()
second = spawner.active["2"] = MagicMock()
spawner.queue.put(("1", None))
spawner.queue.put(("2", Exception()))
spawner.queue.put(("1", False))
spawner.queue.put(("2", True))
spawner.queue.put(None) # terminate
spawner.run()