Skip to content
Snippets Groups Projects
Commit ed3702ef authored by Dmitry Rodionov's avatar Dmitry Rodionov Committed by Yaroslav Dynnikov
Browse files

chore: remove deepdiff because pytest already supports desired output

pytest supports providing full diff between dictionaries when higher
verbosity is specified. For details see
https://docs.pytest.org/en/7.1.x/how-to/output.html#verbosity.

Make use of max verbosity level in CI (-vv)

(cherry picked from commit ce9ddc26)
parent c664f2c6
No related branches found
No related tags found
No related merge requests found
......@@ -194,7 +194,8 @@ test-linux:
- cargo build --features webui,error_injection --locked
- >
pipenv run pytest -v
# -vv shows extended diff for failures
pipenv run pytest -vv
--numprocesses auto
--junitxml=junit_pytest.xml
--with-webui
......
......@@ -18,7 +18,6 @@ pytest-repeat = "*"
msgpack = "*"
pexpect = "*"
pyyaml = "*"
deepdiff = "*"
tomli = {version = ">=1.1.0", markers = "python_version < '3.11'"}
[requires]
......
This diff is collapsed.
from deepdiff import DeepDiff # type: ignore
from conftest import Cluster, Instance
from urllib.request import urlopen
import pytest
......@@ -41,59 +40,50 @@ def test_webui(instance: Instance):
with urlopen(f"http://{http_listen}/api/v1/tiers") as response:
assert response.headers.get("content-type") == "application/json"
diff = DeepDiff(
json.load(response),
[
{
"replicasets": [
{
"grade": "Online",
"version": instance_version,
"instances": [
{
"failureDomain": {},
"isLeader": True,
"currentGrade": "Online",
"targetGrade": "Online",
"name": "i1",
"version": instance_version,
"httpAddress": http_listen,
"binaryAddress": instance.listen,
}
],
"instanceCount": 1,
"capacityUsage": 100,
"memory": {
"usable": 33554432,
"used": 33554432,
},
"uuid": instance.replicaset_uuid(),
"id": "r1",
}
],
"replicasetCount": 1,
"rf": 1,
"instanceCount": 1,
"can_vote": True,
"name": "default",
"plugins": [],
}
],
)
assert len(diff) == 0, diff
assert json.load(response) == [
{
"replicasets": [
{
"grade": "Online",
"version": instance_version,
"instances": [
{
"failureDomain": {},
"isLeader": True,
"currentGrade": "Online",
"targetGrade": "Online",
"name": "i1",
"version": instance_version,
"httpAddress": http_listen,
"binaryAddress": instance.listen,
}
],
"instanceCount": 1,
"capacityUsage": 50,
"memory": {
"usable": 67108864,
"used": 33554432,
},
"uuid": instance.replicaset_uuid(),
"id": "r1",
}
],
"replicasetCount": 1,
"rf": 1,
"instanceCount": 1,
"can_vote": True,
"name": "default",
"plugins": [],
}
]
with urlopen(f"http://{http_listen}/api/v1/cluster") as response:
assert response.headers.get("content-type") == "application/json"
response = json.load(response)
diff = DeepDiff(
response,
{
"capacityUsage": 100,
"replicasetsCount": 1,
"instancesCurrentGradeOffline": 0,
"currentInstaceVersion": instance_version,
"memory": {"usable": 33554432, "used": 33554432},
"instancesCurrentGradeOnline": 1,
},
)
assert len(diff) == 0, diff
assert json.load(response) == {
"capacityUsage": 50,
"replicasetsCount": 1,
"instancesCurrentGradeOffline": 0,
"currentInstaceVersion": instance_version,
"memory": {"usable": 67108864, "used": 33554432},
"instancesCurrentGradeOnline": 1,
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment