anikeev-yadro/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add shell parameter to acl function calls

Browse source 
Signed-off-by: Vladimir Domnich <v.domnich@yadro.com>
This commit is contained in:
Vladimir Domnich 2022-10-18 11:10:58 +04:00 committed by Vladimir
parent 59f7679b5d
commit 7d54641e54
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pytest_tests/testsuites/acl/storage_group/test_storagegroup.py
View file

@ -124,7 +124,12 @@ class TestStorageGroup:
for op in EACLOperation for op in EACLOperation
for role in EACLRole for role in EACLRole
] ]
set_eacl(self.main_wallet, cid, create_eacl(cid, eacl_deny)) set_eacl(
self.main_wallet,
cid,
create_eacl(cid, eacl_deny, shell=client_shell),
shell=client_shell,
)
self.expect_failure_for_storagegroup_operations( self.expect_failure_for_storagegroup_operations(
self.main_wallet, cid, objects, storage_group self.main_wallet, cid, objects, storage_group
) )

14
pytest_tests/testsuites/acl/test_eacl.py
View file

@ -39,7 +39,9 @@ class TestEACLContainer:
NODE_COUNT = len(NEOFS_NETMAP_DICT.keys()) NODE_COUNT = len(NEOFS_NETMAP_DICT.keys())
@pytest.fixture(scope="function") @pytest.fixture(scope="function")
def eacl_full_placement_container_with_object(self, wallets, file_path, shell: Shell): def eacl_full_placement_container_with_object(
self, wallets, file_path, client_shell: Shell
) -> str:
user_wallet = wallets.get_wallet() user_wallet = wallets.get_wallet()
with allure.step("Create eACL public container with full placement rule"): with allure.step("Create eACL public container with full placement rule"):
full_placement_rule = ( full_placement_rule = (
@ -49,12 +51,14 @@ class TestEACLContainer:
user_wallet.wallet_path, user_wallet.wallet_path,
full_placement_rule, full_placement_rule,
basic_acl=PUBLIC_ACL, basic_acl=PUBLIC_ACL,
shell=shell, shell=client_shell,
) )
with allure.step("Add test object to container"): with allure.step("Add test object to container"):
oid = put_object(user_wallet.wallet_path, file_path, cid) oid = put_object(user_wallet.wallet_path, file_path, cid)
wait_object_replication_on_nodes(user_wallet.wallet_path, cid, oid, self.NODE_COUNT) wait_object_replication_on_nodes(
user_wallet.wallet_path, cid, oid, self.NODE_COUNT, shell=client_shell
)
yield cid, oid, file_path yield cid, oid, file_path
@ -227,7 +231,9 @@ class TestEACLContainer:
storage_wallet_path = NEOFS_NETMAP_DICT[[*NEOFS_NETMAP_DICT][0]]["wallet_path"] storage_wallet_path = NEOFS_NETMAP_DICT[[*NEOFS_NETMAP_DICT][0]]["wallet_path"]
with allure.step("Wait for dropped object replicated"): with allure.step("Wait for dropped object replicated"):
wait_object_replication_on_nodes(storage_wallet_path, cid, oid, self.NODE_COUNT) wait_object_replication_on_nodes(
storage_wallet_path, cid, oid, self.NODE_COUNT, shell=client_shell
)
@allure.title("Testcase to validate NeoFS system operations with extended ACL") @allure.title("Testcase to validate NeoFS system operations with extended ACL")
def test_extended_actions_system(self, wallets, client_shell, eacl_container_with_objects): def test_extended_actions_system(self, wallets, client_shell, eacl_container_with_objects):