arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-08-26 19:39:57 +00:00
Code Issues Projects Releases Wiki Activity

dynamic html load (#63)

Browse Source 
* dynamic html load
* split by classes
This commit is contained in:
Evgenii Alekseev
2022-05-20 22:29:36 +03:00
committed by GitHub
parent 5674b7b388
commit 47de715d7d
72 changed files with 720 additions and 706 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/ahriman/core/auth/test_auth.py
View File

@ -71,4 +71,4 @@ async def test_verify_access(auth: Auth, user: User) -> None:
must allow any access
"""
assert await auth.verify_access(user.username, user.access, None)
assert await auth.verify_access(user.username, UserAccess.Write, None)
assert await auth.verify_access(user.username, UserAccess.Full, None)

2
tests/ahriman/core/auth/test_mapping.py
View File

@ -79,4 +79,4 @@ async def test_verify_access(mapping: Mapping, user: User, mocker: MockerFixture
"""
mocker.patch("ahriman.core.database.SQLite.user_get", return_value=user)
assert await mapping.verify_access(user.username, user.access, None)
assert not await mapping.verify_access(user.username, UserAccess.Write, None)
assert not await mapping.verify_access(user.username, UserAccess.Full, None)

8
tests/ahriman/core/database/migrations/test_m002_user_access.py Normal file
View File

@ -0,0 +1,8 @@
from ahriman.core.database.migrations.m002_user_access import steps
def test_migration_package_source() -> None:
"""
migration must not be empty
"""
assert steps

10
tests/ahriman/core/database/operations/test_auth_operations.py
View File

@ -29,7 +29,7 @@ def test_user_list_filter_by_username(database: SQLite) -> None:
must return users filtered by its id
"""
first = User("1", "", UserAccess.Read)
second = User("2", "", UserAccess.Write)
second = User("2", "", UserAccess.Full)
third = User("3", "", UserAccess.Read)
database.user_update(first)
@ -46,7 +46,7 @@ def test_user_list_filter_by_access(database: SQLite) -> None:
must return users filtered by its access
"""
first = User("1", "", UserAccess.Read)
second = User("2", "", UserAccess.Write)
second = User("2", "", UserAccess.Full)
third = User("3", "", UserAccess.Read)
database.user_update(first)
@ -64,7 +64,7 @@ def test_user_list_filter_by_username_access(database: SQLite) -> None:
must return users filtered by its access and username
"""
first = User("1", "", UserAccess.Read)
second = User("2", "", UserAccess.Write)
second = User("2", "", UserAccess.Full)
third = User("3", "", UserAccess.Read)
database.user_update(first)
@ -72,7 +72,7 @@ def test_user_list_filter_by_username_access(database: SQLite) -> None:
database.user_update(third)
assert database.user_list("1", UserAccess.Read) == [first]
assert not database.user_list("1", UserAccess.Write)
assert not database.user_list("1", UserAccess.Full)
def test_user_remove_update(database: SQLite, user: User) -> None:
@ -92,6 +92,6 @@ def test_user_update(database: SQLite, user: User) -> None:
assert database.user_get(user.username) == user
new_user = user.hash_password("salt")
new_user.access = UserAccess.Write
new_user.access = UserAccess.Full
database.user_update(new_user)
assert database.user_get(new_user.username) == new_user

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

@ -3,7 +3,7 @@ from pytest_mock import MockerFixture
from ahriman.core.configuration import Configuration
from ahriman.core.status.client import Client
from ahriman.core.status.web_client import WebClient
from ahriman.models.build_status import BuildStatusEnum
from ahriman.models.build_status import BuildStatus, BuildStatusEnum
from ahriman.models.internal_status import InternalStatus
from ahriman.models.package import Package
@ -51,14 +51,11 @@ def test_get_internal(client: Client) -> None:
"""
must return dummy status for web service
"""
assert client.get_internal() == InternalStatus()
expected = InternalStatus(BuildStatus())
actual = client.get_internal()
actual.status.timestamp = expected.status.timestamp
def test_get_self(client: Client) -> None:
"""
must return unknown status for service
"""
assert client.get_self().status == BuildStatusEnum.Unknown
assert actual == expected
def test_remove(client: Client, package_ahriman: Package) -> None:

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

@ -13,14 +13,6 @@ from ahriman.models.package import Package
from ahriman.models.user import User
def test_ahriman_url(web_client: WebClient) -> None:
"""
must generate service status url correctly
"""
assert web_client._ahriman_url.startswith(web_client.address)
assert web_client._ahriman_url.endswith("/status-api/v1/ahriman")
def test_status_url(web_client: WebClient) -> None:
"""
must generate package status url correctly
@ -173,7 +165,7 @@ def test_get_internal(web_client: WebClient, mocker: MockerFixture) -> None:
must return web service status
"""
response_obj = Response()
response_obj._content = json.dumps(InternalStatus(architecture="x86_64").view()).encode("utf8")
response_obj._content = json.dumps(InternalStatus(BuildStatus(), architecture="x86_64").view()).encode("utf8")
response_obj.status_code = 200
requests_mock = mocker.patch("requests.Session.get", return_value=response_obj)
@ -188,7 +180,7 @@ def test_get_internal_failed(web_client: WebClient, mocker: MockerFixture) -> No
must suppress any exception happened during web service status getting
"""
mocker.patch("requests.Session.get", side_effect=Exception())
assert web_client.get_internal() == InternalStatus()
assert web_client.get_internal().architecture is None
def test_get_internal_failed_http_error(web_client: WebClient, mocker: MockerFixture) -> None:
@ -196,38 +188,7 @@ def test_get_internal_failed_http_error(web_client: WebClient, mocker: MockerFix
must suppress HTTP exception happened during web service status getting
"""
mocker.patch("requests.Session.get", side_effect=requests.exceptions.HTTPError())
assert web_client.get_internal() == InternalStatus()
def test_get_self(web_client: WebClient, mocker: MockerFixture) -> None:
"""
must return service status
"""
response_obj = Response()
response_obj._content = json.dumps(BuildStatus().view()).encode("utf8")
response_obj.status_code = 200
requests_mock = mocker.patch("requests.Session.get", return_value=response_obj)
result = web_client.get_self()
requests_mock.assert_called_once_with(web_client._ahriman_url)
assert result.status == BuildStatusEnum.Unknown
def test_get_self_failed(web_client: WebClient, mocker: MockerFixture) -> None:
"""
must suppress any exception happened during service status getting
"""
mocker.patch("requests.Session.get", side_effect=Exception())
assert web_client.get_self().status == BuildStatusEnum.Unknown
def test_get_self_failed_http_error(web_client: WebClient, mocker: MockerFixture) -> None:
"""
must suppress HTTP exception happened during service status getting
"""
mocker.patch("requests.Session.get", side_effect=requests.exceptions.HTTPError())
assert web_client.get_self().status == BuildStatusEnum.Unknown
assert web_client.get_internal().architecture is None
def test_remove(web_client: WebClient, package_ahriman: Package, mocker: MockerFixture) -> None:

6
tests/ahriman/core/test_util.py
View File

@ -320,9 +320,11 @@ def test_walk(resource_path_root: Path) -> None:
resource_path_root / "models" / "package_gcc10_srcinfo",
resource_path_root / "models" / "package_tpacpi-bat-git_srcinfo",
resource_path_root / "models" / "package_yay_srcinfo",
resource_path_root / "web" / "templates" / "build-status" / "failed-modal.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "login-modal.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "package-actions-modals.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "package-actions-script.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "package-add-modal.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "success-modal.jinja2",
resource_path_root / "web" / "templates" / "build-status" / "table.jinja2",
resource_path_root / "web" / "templates" / "static" / "favicon.ico",
resource_path_root / "web" / "templates" / "utils" / "bootstrap-scripts.jinja2",
resource_path_root / "web" / "templates" / "utils" / "style.jinja2",