From 448570afa016cbe998bf2c38b82bdb8b655d0e86 Mon Sep 17 00:00:00 2001 From: Vladimir Domnich Date: Wed, 3 Aug 2022 18:50:01 +0300 Subject: [PATCH] Fix get_range usage in acl tests Signed-off-by: Vladimir Domnich --- pytest_tests/testsuites/acl/test_acl.py | 4 ++-- robot/resources/lib/python_keywords/neofs_verbs.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pytest_tests/testsuites/acl/test_acl.py b/pytest_tests/testsuites/acl/test_acl.py index 02bad4e..9963379 100644 --- a/pytest_tests/testsuites/acl/test_acl.py +++ b/pytest_tests/testsuites/acl/test_acl.py @@ -91,7 +91,7 @@ class TestACL: head_object(wallet, cid, oid) 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): 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' 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') search_object(current_wallet, cid) diff --git a/robot/resources/lib/python_keywords/neofs_verbs.py b/robot/resources/lib/python_keywords/neofs_verbs.py index 2b53cff..978c8db 100644 --- a/robot/resources/lib/python_keywords/neofs_verbs.py +++ b/robot/resources/lib/python_keywords/neofs_verbs.py @@ -153,8 +153,8 @@ def delete_object(wallet: str, cid: str, oid: str, bearer: str = "", wallet_conf @keyword('Get Range') -def get_range(wallet: str, cid: str, oid: str, range_cut: str, - wallet_config: str = WALLET_CONFIG, bearer: str = "", options: str = ""): +def get_range(wallet: str, cid: str, oid: str, range_cut: str, wallet_config: str = WALLET_CONFIG, + bearer: str = "", options: str = ""): """ 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 options (optional, str): any options which `neofs-cli object range` accepts 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()}" cmd = (