mmalygina/frostfs-testcases
1
0
Fork 0
forked from TrueCloudLab/frostfs-testcases
Code Pull requests Activity

Fix get_range usage in acl tests

Browse source 
Signed-off-by: Vladimir Domnich <v.domnich@yadro.com>
This commit is contained in:
Vladimir Domnich 2022-08-03 18:50:01 +03:00
parent eff4b032a5
commit 448570afa0
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pytest_tests/testsuites/acl/test_acl.py
View file

@ -91,7 +91,7 @@ class TestACL:
head_object(wallet, cid, oid) head_object(wallet, cid, oid)
with pytest.raises(Exception, match=err_pattern): with pytest.raises(Exception, match=err_pattern):
get_range(wallet, cid, oid, file_path='s_get_range', bearer='', range_cut='0:10') get_range(wallet, cid, oid, bearer='', range_cut='0:10')
with pytest.raises(Exception, match=err_pattern): with pytest.raises(Exception, match=err_pattern):
get_range_hash(wallet, cid, oid, bearer_token='', range_cut='0:10') get_range_hash(wallet, cid, oid, bearer_token='', range_cut='0:10')
@ -110,7 +110,7 @@ class TestACL:
assert get_file_hash(got_file) == get_file_hash(file_name), 'Expected hashes are the same' assert get_file_hash(got_file) == get_file_hash(file_name), 'Expected hashes are the same'
head_object(current_wallet, cid, oid) head_object(current_wallet, cid, oid)
get_range(current_wallet, cid, oid, file_path='s_get_range', bearer='', range_cut='0:10') get_range(current_wallet, cid, oid, bearer='', range_cut='0:10')
get_range_hash(current_wallet, cid, oid, bearer_token='', range_cut='0:10') get_range_hash(current_wallet, cid, oid, bearer_token='', range_cut='0:10')
search_object(current_wallet, cid) search_object(current_wallet, cid)

6
robot/resources/lib/python_keywords/neofs_verbs.py
View file

@ -153,8 +153,8 @@ def delete_object(wallet: str, cid: str, oid: str, bearer: str = "", wallet_conf
@keyword('Get Range') @keyword('Get Range')
def get_range(wallet: str, cid: str, oid: str, range_cut: str, def get_range(wallet: str, cid: str, oid: str, range_cut: str, wallet_config: str = WALLET_CONFIG,
wallet_config: str = WALLET_CONFIG, bearer: str = "", options: str = ""): bearer: str = "", options: str = ""):
""" """
GETRANGE an Object. GETRANGE an Object.
@ -167,7 +167,7 @@ def get_range(wallet: str, cid: str, oid: str, range_cut: str,
wallet_config(optional, str): path to the wallet config wallet_config(optional, str): path to the wallet config
options (optional, str): any options which `neofs-cli object range` accepts options (optional, str): any options which `neofs-cli object range` accepts
Returns: Returns:
(void) (str, bytes) - path to the file with range content and content of this file as bytes
""" """
range_file = f"{ASSETS_DIR}/{uuid.uuid4()}" range_file = f"{ASSETS_DIR}/{uuid.uuid4()}"
cmd = ( cmd = (