From 805e014c2f12794ed0bb997a2128860028faf6aa Mon Sep 17 00:00:00 2001 From: Vladimir Avdeev Date: Wed, 19 Oct 2022 17:22:54 +0300 Subject: [PATCH] Fix: Allow RANGEHASH by default for system wallets Signed-off-by: Vladimir Avdeev --- pytest_tests/testsuites/acl/test_eacl.py | 66 +++++++++---------- .../lib/python_keywords/storage_group.py | 6 +- 2 files changed, 35 insertions(+), 37 deletions(-) diff --git a/pytest_tests/testsuites/acl/test_eacl.py b/pytest_tests/testsuites/acl/test_eacl.py index 0aa9a2f8..bc1a06d7 100644 --- a/pytest_tests/testsuites/acl/test_eacl.py +++ b/pytest_tests/testsuites/acl/test_eacl.py @@ -48,8 +48,8 @@ class TestEACLContainer: f"REP {self.NODE_COUNT} IN X CBF 1 SELECT {self.NODE_COUNT} FROM * AS X" ) cid = create_container( - user_wallet.wallet_path, - full_placement_rule, + wallet=user_wallet.wallet_path, + rule=full_placement_rule, basic_acl=PUBLIC_ACL, shell=client_shell, ) @@ -322,22 +322,21 @@ class TestEACLContainer: wallet_config=storage_wallet.config_path, ) - with pytest.raises(AssertionError): - assert can_get_range_hash_of_object( - wallet=ir_wallet.wallet_path, - cid=cid, - oid=object_oids[0], - shell=client_shell, - wallet_config=ir_wallet.config_path, - ) - with pytest.raises(AssertionError): - assert can_get_range_hash_of_object( - wallet=storage_wallet.wallet_path, - cid=cid, - oid=object_oids[0], - shell=client_shell, - wallet_config=storage_wallet.config_path, - ) + assert can_get_range_hash_of_object( + wallet=ir_wallet.wallet_path, + cid=cid, + oid=object_oids[0], + shell=client_shell, + wallet_config=ir_wallet.config_path, + ) + + assert can_get_range_hash_of_object( + wallet=storage_wallet.wallet_path, + cid=cid, + oid=object_oids[0], + shell=client_shell, + wallet_config=storage_wallet.config_path, + ) with pytest.raises(AssertionError): assert can_delete_object( @@ -588,22 +587,21 @@ class TestEACLContainer: wallet_config=storage_wallet.config_path, ) - with pytest.raises(AssertionError): - assert can_get_range_hash_of_object( - wallet=ir_wallet.wallet_path, - cid=cid, - oid=object_oids[0], - shell=client_shell, - wallet_config=ir_wallet.config_path, - ) - with pytest.raises(AssertionError): - assert can_get_range_hash_of_object( - wallet=storage_wallet.wallet_path, - cid=cid, - oid=object_oids[0], - shell=client_shell, - wallet_config=storage_wallet.config_path, - ) + assert can_get_range_hash_of_object( + wallet=ir_wallet.wallet_path, + cid=cid, + oid=object_oids[0], + shell=client_shell, + wallet_config=ir_wallet.config_path, + ) + + assert can_get_range_hash_of_object( + wallet=storage_wallet.wallet_path, + cid=cid, + oid=object_oids[0], + shell=client_shell, + wallet_config=storage_wallet.config_path, + ) with pytest.raises(AssertionError): assert can_delete_object( diff --git a/robot/resources/lib/python_keywords/storage_group.py b/robot/resources/lib/python_keywords/storage_group.py index 63acdd0c..b0da146e 100644 --- a/robot/resources/lib/python_keywords/storage_group.py +++ b/robot/resources/lib/python_keywords/storage_group.py @@ -180,9 +180,9 @@ def verify_get_storage_group( wallet, cid, obj, shell=shell, bearer=bearer, wallet_config=wallet_config ) obj_head = head_object( - wallet, - cid, - link_oid, + wallet=wallet, + cid=cid, + oid=link_oid, shell=shell, is_raw=True, bearer=bearer,