SelfPrivacy/selfprivacy-rest-api
1
0
Fork 0
mirror of https://git.selfprivacy.org/SelfPrivacy/selfprivacy-rest-api.git synced 2024-11-29 07:21:27 +00:00
Code Issues Projects Releases Wiki Activity

fix: yay! tests are working

Browse source
This commit is contained in:
nhnn 2024-07-10 15:49:27 +03:00
parent e988f77419
commit 7e295f2e91
2 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
selfprivacy_api/graphql/queries/monitoring.py
View file

@ -5,19 +5,14 @@ from selfprivacy_api.utils.prometheus import PrometheusQueries, PrometheusQueryR
@strawberry.type @strawberry.type
class Monitoring: class Monitoring:
@staticmethod
@strawberry.field @strawberry.field
def disk_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult: def disk_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult:
return PrometheusQueries.disk_usage(start, end, step) return PrometheusQueries.disk_usage(start, end, step)
@staticmethod
@strawberry.field @strawberry.field
def memory_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult: def memory_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult:
return PrometheusQueries.memory_usage(start, end, step) return PrometheusQueries.memory_usage(start, end, step)
@staticmethod
@strawberry.field @strawberry.field
def cpu_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult: def cpu_usage(start: Optional[int] = None, end: Optional[int] = None, step: int = 60) -> PrometheusQueryResult:
c = PrometheusQueries.cpu_usage(start, end, step)
return c
return PrometheusQueries.cpu_usage(start, end, step) return PrometheusQueries.cpu_usage(start, end, step)

32
tests/test_graphql/test_api_monitoring.py
View file

@ -3,10 +3,10 @@
# pylint: disable=missing-function-docstring # pylint: disable=missing-function-docstring
import pytest import pytest
from selfprivacy_api.utils.prometheus import PrometheusQueryResult
from tests.test_graphql.common import ( from tests.test_graphql.common import (
assert_empty, assert_empty,
get_data, get_data,
assert_ok,
) )
@ -15,7 +15,7 @@ def generate_mock_metrics(name: str):
"data": { "data": {
"monitoring": { "monitoring": {
f"{name}": { f"{name}": {
"result_type": "matrix", "resultType": "matrix",
"result": [ "result": [
{ {
"metric": {"instance": "127.0.0.1:9002"}, "metric": {"instance": "127.0.0.1:9002"},
@ -75,11 +75,15 @@ def generate_mock_query_with_options(name):
""" """
def prometheus_result_from_dict(dict):
return PrometheusQueryResult(result_type=dict["resultType"], result=dict["result"])
@pytest.fixture @pytest.fixture
def mock_cpu_usage(mocker): def mock_cpu_usage(mocker):
mock = mocker.patch( mock = mocker.patch(
"selfprivacy_api.utils.prometheus.PrometheusQueries._send_query", "selfprivacy_api.utils.prometheus.PrometheusQueries._send_query",
return_value=MOCK_CPU_USAGE_RESPONSE["data"]["monitoring"]["cpuUsage"], return_value=prometheus_result_from_dict(MOCK_CPU_USAGE_RESPONSE["data"]["monitoring"]["cpuUsage"]),
) )
return mock return mock
@ -88,7 +92,7 @@ def mock_cpu_usage(mocker):
def mock_memory_usage(mocker): def mock_memory_usage(mocker):
mock = mocker.patch( mock = mocker.patch(
"selfprivacy_api.utils.prometheus.PrometheusQueries._send_query", "selfprivacy_api.utils.prometheus.PrometheusQueries._send_query",
return_value=MOCK_MEMORY_USAGE_RESPONSE["data"]["monitoring"]["memoryUsage"], return_value=prometheus_result_from_dict(MOCK_MEMORY_USAGE_RESPONSE["data"]["monitoring"]["memoryUsage"]),
) )
return mock return mock
@ -97,7 +101,7 @@ def mock_memory_usage(mocker):
def mock_disk_usage(mocker): def mock_disk_usage(mocker):
mock = mocker.patch( mock = mocker.patch(
"selfprivacy_api.utils.prometheus.PrometheusQueries._send_query", "selfprivacy_api.utils.prometheus.PrometheusQueries._send_query",
return_value=MOCK_DISK_USAGE_RESPONSE["data"]["monitoring"]["diskUsage"], return_value=prometheus_result_from_dict(MOCK_DISK_USAGE_RESPONSE["data"]["monitoring"]["diskUsage"]),
) )
return mock return mock
@ -109,8 +113,7 @@ def test_graphql_get_disk_usage(client, authorized_client, mock_disk_usage):
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_DISK_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_DISK_USAGE_RESPONSE["data"]
def test_graphql_get_disk_usage_with_options( def test_graphql_get_disk_usage_with_options(
@ -129,8 +132,7 @@ def test_graphql_get_disk_usage_with_options(
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_DISK_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_DISK_USAGE_RESPONSE["data"]
def test_graphql_get_disk_usage_unauthorized(client): def test_graphql_get_disk_usage_unauthorized(client):
@ -148,8 +150,7 @@ def test_graphql_get_memory_usage(client, authorized_client, mock_memory_usage):
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_MEMORY_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_MEMORY_USAGE_RESPONSE["data"]
def test_graphql_get_memory_usage_with_options( def test_graphql_get_memory_usage_with_options(
@ -168,8 +169,7 @@ def test_graphql_get_memory_usage_with_options(
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_MEMORY_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_MEMORY_USAGE_RESPONSE["data"]
def test_graphql_get_memory_usage_unauthorized(client): def test_graphql_get_memory_usage_unauthorized(client):
@ -187,8 +187,7 @@ def test_graphql_get_cpu_usage(client, authorized_client, mock_cpu_usage):
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_CPU_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_CPU_USAGE_RESPONSE["data"]
def test_graphql_get_cpu_usage_with_options(client, authorized_client, mock_cpu_usage): def test_graphql_get_cpu_usage_with_options(client, authorized_client, mock_cpu_usage):
@ -205,8 +204,7 @@ def test_graphql_get_cpu_usage_with_options(client, authorized_client, mock_cpu_
) )
data = get_data(response) data = get_data(response)
assert_ok(data) assert data == MOCK_CPU_USAGE_RESPONSE["data"]
assert data["data"] == MOCK_CPU_USAGE_RESPONSE["data"]
def test_graphql_get_cpu_usage_unauthorized(client): def test_graphql_get_cpu_usage_unauthorized(client):