Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NAS-130928 / 25.04 / Removed REST calls in test_account #14412

Merged
merged 4 commits into from
Sep 4, 2024
Merged

NAS-130928 / 25.04 / Removed REST calls in test_account #14412

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d06427d
Removed REST calls
aiden3c Sep 3, 2024
c97a8cb
Merge remote-tracking branch 'origin/master' into NAS-130928
aiden3c Sep 4, 2024
4012179
Starting cleanup
aiden3c Sep 4, 2024
11eb957
Revert "Starting cleanup"
aiden3c Sep 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 12 additions & 62 deletions tests/api2/test_account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,12 @@
import os
import sys

import pytest

from middlewared.test.integration.assets.account import user, group
from middlewared.test.integration.assets.api_key import api_key
from middlewared.test.integration.utils import call, client
from middlewared.test.integration.utils.audit import expect_audit_method_calls

sys.path.append(os.getcwd())
from functions import DELETE, POST, PUT


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_create_account_audit(api):
def test_create_account_audit():
user_id = None
try:
with expect_audit_method_calls([{
Expand All @@ -36,21 +29,13 @@ def test_create_account_audit(api):
"home": "/nonexistent",
"password": "password",
}
if api == "ws":
user_id = call("user.create", payload)
elif api == "rest":
result = POST(f"/user/", payload)
assert result.status_code == 200, result.text
user_id = result.json()
else:
raise ValueError(api)
user_id = call("user.create", payload)
finally:
if user_id is not None:
call("user.delete", user_id)


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_update_account_audit(api):
def test_update_account_audit():
with user({
"username": "user2",
"full_name": "user2",
Expand All @@ -62,17 +47,10 @@ def test_update_account_audit(api):
"params": [u["id"], {}],
"description": "Update user user2",
}]):
if api == "ws":
call("user.update", u["id"], {})
elif api == "rest":
result = PUT(f"/user/id/{u['id']}", {})
assert result.status_code == 200, result.text
else:
raise ValueError(api)
call("user.update", u["id"], {})


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_delete_account_audit(api):
def test_delete_account_audit():
with user({
"username": "user2",
"full_name": "user2",
Expand All @@ -84,17 +62,10 @@ def test_delete_account_audit(api):
"params": [u["id"], {}],
"description": "Delete user user2",
}]):
if api == "ws":
call("user.delete", u["id"], {})
elif api == "rest":
result = DELETE(f"/user/id/{u['id']}")
assert result.status_code == 200, result.text
else:
raise ValueError(api)
call("user.delete", u["id"], {})


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_create_group_audit(api):
def test_create_group_audit():
group_id = None
try:
with expect_audit_method_calls([{
Expand All @@ -109,21 +80,13 @@ def test_create_group_audit(api):
payload = {
"name": "group2",
}
if api == "ws":
group_id = call("group.create", payload)
elif api == "rest":
result = POST(f"/group/", payload)
assert result.status_code == 200, result.text
group_id = result.json()
else:
raise ValueError(api)
group_id = call("group.create", payload)
finally:
if group_id is not None:
call("group.delete", group_id)


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_update_group_audit(api):
def test_update_group_audit():
with group({
"name": "group2",
}) as g:
Expand All @@ -132,17 +95,10 @@ def test_update_group_audit(api):
"params": [g["id"], {}],
"description": "Update group group2",
}]):
if api == "ws":
call("group.update", g["id"], {})
elif api == "rest":
result = PUT(f"/group/id/{g['id']}", {})
assert result.status_code == 200, result.text
else:
raise ValueError(api)
call("group.update", g["id"], {})


@pytest.mark.parametrize("api", ["ws", "rest"])
def test_delete_group_audit(api):
def test_delete_group_audit():
with group({
"name": "group2",
}) as g:
Expand All @@ -151,13 +107,7 @@ def test_delete_group_audit(api):
"params": [g["id"], {}],
"description": "Delete group group2",
}]):
if api == "ws":
call("group.delete", g["id"], {})
elif api == "rest":
result = DELETE(f"/group/id/{g['id']}")
assert result.status_code == 200, result.text
else:
raise ValueError(api)
call("group.delete", g["id"], {})


def test_update_account_using_api_key():
Expand Down
Loading