From 18c30c39ff4e368b18076b5d460fc5f6cf4f8c2a Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Thu, 9 Dec 2021 13:58:51 +0300 Subject: [PATCH] [#334] Move common_steps* Signed-off-by: Elizaveta Chichindaeva --- robot/resources/lib/{ => python}/acl.py | 0 .../resources/lib/{ => python}/cli_helpers.py | 0 .../lib/{ => python}/cli_keywords.py | 0 robot/resources/lib/{ => python}/gates.py | 0 robot/resources/lib/{ => python}/neofs.py | 0 .../lib/{ => python}/payment_neogo.py | 0 .../lib/{ => python}/utility_keywords.py | 0 .../lib/robot}/common_steps_acl_basic.robot | 6 +++--- .../lib/robot}/common_steps_acl_bearer.robot | 4 ++-- .../robot}/common_steps_acl_extended.robot | 8 ++++---- .../lib/robot}/common_steps_object.robot | 2 +- .../lib/{ => robot}/payment_operations.robot | 2 +- .../lib/{ => robot}/setup_teardown.robot | 3 +-- robot/resources/lib/{ => robot}/storage.robot | 2 +- .../acl/acl_basic_private_container.robot | 11 +++++----- ...basic_private_container_storagegroup.robot | 10 +++++----- .../acl/acl_basic_public_container.robot | 11 +++++----- ..._basic_public_container_storagegroup.robot | 10 +++++----- .../acl/acl_basic_readonly_container.robot | 11 +++++----- ...asic_readonly_container_storagegroup.robot | 10 +++++----- .../integration/acl/acl_bearer_allow.robot | 8 ++++---- .../acl/acl_bearer_allow_storagegroup.robot | 8 ++++---- .../integration/acl/acl_bearer_compound.robot | 8 ++++---- .../acl/acl_bearer_filter_oid_equal.robot | 4 ++-- .../acl/acl_bearer_filter_oid_not_equal.robot | 8 ++++---- .../acl_bearer_filter_userheader_equal.robot | 8 ++++---- ...l_bearer_filter_userheader_not_equal.robot | 8 ++++---- .../acl/acl_bearer_inaccessible.robot | 9 ++++----- ...l_bearer_request_filter_xheader_deny.robot | 8 ++++---- ..._bearer_request_filter_xheader_equal.robot | 8 ++++---- ...rer_request_filter_xheader_not_equal.robot | 8 ++++---- .../acl/acl_extended_actions_other.robot | 8 ++++---- .../acl/acl_extended_actions_pubkey.robot | 8 ++++---- .../acl/acl_extended_actions_system.robot | 10 +++++----- .../acl/acl_extended_actions_user.robot | 4 ++-- .../acl/acl_extended_compound.robot | 10 +++++----- .../acl/acl_extended_deny_replication.robot | 4 ++-- .../acl/acl_extended_filters.robot | 8 ++++---- .../container_id_filter.robot | 13 ++++++------ .../creation_epoch_filter.robot | 12 +++++------ .../homomorphic_hash_filter.robot | 15 +++++++------- .../object_attributes/object_id_filter.robot | 12 +++++------ .../object_type_filter.robot | 15 +++++++------- .../object_attributes/owner_id_filter.robot | 15 +++++++------- .../payload_hash_filter.robot | 15 +++++++------- .../payload_length_filter.robot | 18 ++++++++--------- .../object_attributes/version_filter.robot | 15 +++++++------- .../integration/cli/accounting/balance.robot | 2 +- .../cli/netmap/networkinfo_rpc_method.robot | 2 +- .../container/container_attributes.robot | 12 +++++------ .../container/container_delete.robot | 4 ++-- .../container/container_session_token.robot | 12 +++++------ .../integration/network/netmap_control.robot | 2 +- .../network/netmap_control_drop.robot | 20 +++++++++---------- .../integration/network/netmap_simple.robot | 6 +++--- .../integration/network/replication.robot | 18 +++++++---------- .../object/object_attributes.robot | 12 +++++------ .../integration/object/object_complex.robot | 2 +- .../object/object_expiration.robot | 2 +- .../integration/object/object_simple.robot | 2 +- .../object/object_storagegroup_complex.robot | 11 +++++----- .../object/object_storagegroup_simple.robot | 10 +++++----- .../integration/payment/withdraw.robot | 2 +- .../integration/services/http_gate.robot | 2 +- .../integration/services/s3_gate_bucket.robot | 17 ++++++++-------- .../integration/services/s3_gate_object.robot | 20 ++++++++++--------- robot/variables/common.py | 2 -- robot/variables/{acl.py => wellknown_acl.py} | 0 venv/localtest/environment.sh | 2 +- 69 files changed, 256 insertions(+), 263 deletions(-) rename robot/resources/lib/{ => python}/acl.py (100%) rename robot/resources/lib/{ => python}/cli_helpers.py (100%) rename robot/resources/lib/{ => python}/cli_keywords.py (100%) rename robot/resources/lib/{ => python}/gates.py (100%) rename robot/resources/lib/{ => python}/neofs.py (100%) rename robot/resources/lib/{ => python}/payment_neogo.py (100%) rename robot/resources/lib/{ => python}/utility_keywords.py (100%) rename robot/{testsuites/integration/acl => resources/lib/robot}/common_steps_acl_basic.robot (93%) rename robot/{testsuites/integration/acl => resources/lib/robot}/common_steps_acl_bearer.robot (97%) rename robot/{testsuites/integration/acl => resources/lib/robot}/common_steps_acl_extended.robot (98%) rename robot/{testsuites/integration/object => resources/lib/robot}/common_steps_object.robot (96%) rename robot/resources/lib/{ => robot}/payment_operations.robot (98%) rename robot/resources/lib/{ => robot}/setup_teardown.robot (87%) rename robot/resources/lib/{ => robot}/storage.robot (93%) rename robot/variables/{acl.py => wellknown_acl.py} (100%) diff --git a/robot/resources/lib/acl.py b/robot/resources/lib/python/acl.py similarity index 100% rename from robot/resources/lib/acl.py rename to robot/resources/lib/python/acl.py diff --git a/robot/resources/lib/cli_helpers.py b/robot/resources/lib/python/cli_helpers.py similarity index 100% rename from robot/resources/lib/cli_helpers.py rename to robot/resources/lib/python/cli_helpers.py diff --git a/robot/resources/lib/cli_keywords.py b/robot/resources/lib/python/cli_keywords.py similarity index 100% rename from robot/resources/lib/cli_keywords.py rename to robot/resources/lib/python/cli_keywords.py diff --git a/robot/resources/lib/gates.py b/robot/resources/lib/python/gates.py similarity index 100% rename from robot/resources/lib/gates.py rename to robot/resources/lib/python/gates.py diff --git a/robot/resources/lib/neofs.py b/robot/resources/lib/python/neofs.py similarity index 100% rename from robot/resources/lib/neofs.py rename to robot/resources/lib/python/neofs.py diff --git a/robot/resources/lib/payment_neogo.py b/robot/resources/lib/python/payment_neogo.py similarity index 100% rename from robot/resources/lib/payment_neogo.py rename to robot/resources/lib/python/payment_neogo.py diff --git a/robot/resources/lib/utility_keywords.py b/robot/resources/lib/python/utility_keywords.py similarity index 100% rename from robot/resources/lib/utility_keywords.py rename to robot/resources/lib/python/utility_keywords.py diff --git a/robot/testsuites/integration/acl/common_steps_acl_basic.robot b/robot/resources/lib/robot/common_steps_acl_basic.robot similarity index 93% rename from robot/testsuites/integration/acl/common_steps_acl_basic.robot rename to robot/resources/lib/robot/common_steps_acl_basic.robot index d5ef9e1d..201eabf5 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_basic.robot +++ b/robot/resources/lib/robot/common_steps_acl_basic.robot @@ -1,6 +1,6 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py *** Keywords *** @@ -33,4 +33,4 @@ Generate file [Arguments] ${SIZE} ${FILE_S_GEN} = Generate file of bytes ${SIZE} ${FILE_S_HASH_GEN} = Get file hash ${FILE_S_GEN} - [Return] ${FILE_S_GEN} ${FILE_S_HASH_GEN} \ No newline at end of file + [Return] ${FILE_S_GEN} ${FILE_S_HASH_GEN} diff --git a/robot/testsuites/integration/acl/common_steps_acl_bearer.robot b/robot/resources/lib/robot/common_steps_acl_bearer.robot similarity index 97% rename from robot/testsuites/integration/acl/common_steps_acl_bearer.robot rename to robot/resources/lib/robot/common_steps_acl_bearer.robot index 2fd24642..ec38674f 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_bearer.robot +++ b/robot/resources/lib/robot/common_steps_acl_bearer.robot @@ -1,6 +1,6 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py *** Variables *** ${FILE_USR_HEADER} = key1=1,key2=abc diff --git a/robot/testsuites/integration/acl/common_steps_acl_extended.robot b/robot/resources/lib/robot/common_steps_acl_extended.robot similarity index 98% rename from robot/testsuites/integration/acl/common_steps_acl_extended.robot rename to robot/resources/lib/robot/common_steps_acl_extended.robot index f21d698d..3226645f 100644 --- a/robot/testsuites/integration/acl/common_steps_acl_extended.robot +++ b/robot/resources/lib/robot/common_steps_acl_extended.robot @@ -1,13 +1,13 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/eacl_object_filters.py +Variables common.py +Variables eacl_object_filters.py Library acl.py Library neofs.py Library Collections -Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot +Resource common_steps_acl_basic.robot +Resource payment_operations.robot *** Variables *** ${FILE_USR_HEADER} = key1=1,key2=abc diff --git a/robot/testsuites/integration/object/common_steps_object.robot b/robot/resources/lib/robot/common_steps_object.robot similarity index 96% rename from robot/testsuites/integration/object/common_steps_object.robot rename to robot/resources/lib/robot/common_steps_object.robot index c8b557ad..479acf33 100644 --- a/robot/testsuites/integration/object/common_steps_object.robot +++ b/robot/resources/lib/robot/common_steps_object.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library wallet_keywords.py Library rpc_call_keywords.py diff --git a/robot/resources/lib/payment_operations.robot b/robot/resources/lib/robot/payment_operations.robot similarity index 98% rename from robot/resources/lib/payment_operations.robot rename to robot/resources/lib/robot/payment_operations.robot index 52b468f5..70325700 100644 --- a/robot/resources/lib/payment_operations.robot +++ b/robot/resources/lib/robot/payment_operations.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../variables/common.py +Variables common.py Library wallet_keywords.py Library rpc_call_keywords.py diff --git a/robot/resources/lib/setup_teardown.robot b/robot/resources/lib/robot/setup_teardown.robot similarity index 87% rename from robot/resources/lib/setup_teardown.robot rename to robot/resources/lib/robot/setup_teardown.robot index 2a782b20..1268e3cc 100644 --- a/robot/resources/lib/setup_teardown.robot +++ b/robot/resources/lib/robot/setup_teardown.robot @@ -1,8 +1,7 @@ *** Settings *** -Variables ../../variables/common.py +Variables common.py Library OperatingSystem - Library utility_keywords.py *** Keywords *** diff --git a/robot/resources/lib/storage.robot b/robot/resources/lib/robot/storage.robot similarity index 93% rename from robot/resources/lib/storage.robot rename to robot/resources/lib/robot/storage.robot index d1fc2b9b..580d4e35 100644 --- a/robot/resources/lib/storage.robot +++ b/robot/resources/lib/robot/storage.robot @@ -1,6 +1,6 @@ *** Settings *** -Variables ../../variables/common.py +Variables common.py Library Process diff --git a/robot/testsuites/integration/acl/acl_basic_private_container.robot b/robot/testsuites/integration/acl/acl_basic_private_container.robot index daaba3fc..b5d44245 100644 --- a/robot/testsuites/integration/acl/acl_basic_private_container.robot +++ b/robot/testsuites/integration/acl/acl_basic_private_container.robot @@ -1,11 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Variables common.py + +Library neofs.py +Library payment_neogo.py Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot b/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot index 7450ee36..510f5f0c 100644 --- a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot @@ -1,13 +1,13 @@ *** Settings *** -Variables ../../../variables/common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Variables common.py +Library neofs.py +Library payment_neogo.py Library Collections Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_basic_public_container.robot b/robot/testsuites/integration/acl/acl_basic_public_container.robot index db6227a6..a6378abd 100644 --- a/robot/testsuites/integration/acl/acl_basic_public_container.robot +++ b/robot/testsuites/integration/acl/acl_basic_public_container.robot @@ -1,11 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Variables common.py + +Library neofs.py +Library payment_neogo.py Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot b/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot index b3c7fa11..eeb15a8c 100644 --- a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot @@ -1,12 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_basic_readonly_container.robot b/robot/testsuites/integration/acl/acl_basic_readonly_container.robot index 485eb03c..53744d43 100644 --- a/robot/testsuites/integration/acl/acl_basic_readonly_container.robot +++ b/robot/testsuites/integration/acl/acl_basic_readonly_container.robot @@ -1,11 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Variables common.py + +Library neofs.py +Library payment_neogo.py Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot b/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot index d8b46547..1d4c9064 100644 --- a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot @@ -1,12 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Resource common_steps_acl_basic.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_bearer_allow.robot b/robot/testsuites/integration/acl/acl_bearer_allow.robot index 96f4c699..2eacbc7f 100644 --- a/robot/testsuites/integration/acl/acl_bearer_allow.robot +++ b/robot/testsuites/integration/acl/acl_bearer_allow.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library acl.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot b/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot index 9dec6fc2..a80cf366 100644 --- a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot +++ b/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py Library neofs.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_bearer_compound.robot b/robot/testsuites/integration/acl/acl_bearer_compound.robot index f8e7ef21..b60f6921 100644 --- a/robot/testsuites/integration/acl/acl_bearer_compound.robot +++ b/robot/testsuites/integration/acl/acl_bearer_compound.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py Library neofs.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${SYSTEM_KEY} = ${NEOFS_IR_WIF} diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot index 076f3a48..f26427ae 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_oid_equal.robot @@ -1,12 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library acl.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot Resource payment_operations.robot Resource setup_teardown.robot diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot index 836dbd16..cf080980 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_oid_not_equal.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library acl.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot index 3a8d8acf..7d52effd 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_equal.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py Library neofs.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** BearerToken Operations with Filter UserHeader Equal diff --git a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot index 15626ba6..0134a4fc 100644 --- a/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_filter_userheader_not_equal.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py @@ -7,9 +7,9 @@ Library acl.py Library payment_neogo.py Resource common_steps_acl_bearer.robot -Resource ../../../variables/eacl_tables.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource eacl_tables.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** BearerToken Operations Filter UserHeader NotEqual diff --git a/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot b/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot index f9a518ad..6b7ca732 100644 --- a/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot +++ b/robot/testsuites/integration/acl/acl_bearer_inaccessible.robot @@ -1,16 +1,15 @@ *** Settings *** - -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library acl.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** BearerToken Operations for Inaccessible Container diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot index 44838f77..2aa47460 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_deny.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library acl.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** BearerToken Operations diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot index 875479c4..f9ab662a 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_equal.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py Library neofs.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot index 728e2997..9e46579d 100644 --- a/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot +++ b/robot/testsuites/integration/acl/acl_bearer_request_filter_xheader_not_equal.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py Library neofs.py Library payment_neogo.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_extended_actions_other.robot b/robot/testsuites/integration/acl/acl_extended_actions_other.robot index 4384316f..121d2914 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_other.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_other.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py @@ -7,9 +7,9 @@ Library payment_neogo.py Library acl.py Resource common_steps_acl_extended.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource payment_operations.robot +Resource setup_teardown.robot +Resource eacl_tables.robot *** Test cases *** Extended ACL Operations diff --git a/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot b/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot index bef4feff..4338a77b 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_pubkey.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library acl.py @@ -7,9 +7,9 @@ Library neofs.py Library payment_neogo.py Resource common_steps_acl_extended.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource payment_operations.robot +Resource setup_teardown.robot +Resource eacl_tables.robot *** Variables *** ${EACL_KEY} = L1FGTLE6shum3EC7mNTPArUqSCKnmtEweRzyuawtYRZwGjpeRuw1 diff --git a/robot/testsuites/integration/acl/acl_extended_actions_system.robot b/robot/testsuites/integration/acl/acl_extended_actions_system.robot index d341ab1f..2308d4a7 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_system.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_system.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py Library payment_neogo.py Library acl.py -Resource common_steps_acl_extended.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource common_steps_acl_extended.robot +Resource payment_operations.robot +Resource setup_teardown.robot +Resource eacl_tables.robot *** Test cases *** diff --git a/robot/testsuites/integration/acl/acl_extended_actions_user.robot b/robot/testsuites/integration/acl/acl_extended_actions_user.robot index 2dfb0c7b..84665bc9 100644 --- a/robot/testsuites/integration/acl/acl_extended_actions_user.robot +++ b/robot/testsuites/integration/acl/acl_extended_actions_user.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py @@ -9,7 +9,7 @@ Library acl.py Resource common_steps_acl_extended.robot Resource payment_operations.robot Resource setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot *** Test cases *** Extended ACL Operations diff --git a/robot/testsuites/integration/acl/acl_extended_compound.robot b/robot/testsuites/integration/acl/acl_extended_compound.robot index 00b89fa4..4fbcc04c 100644 --- a/robot/testsuites/integration/acl/acl_extended_compound.robot +++ b/robot/testsuites/integration/acl/acl_extended_compound.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py @@ -7,9 +7,9 @@ Library payment_neogo.py Library acl.py Resource common_steps_acl_extended.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource payment_operations.robot +Resource setup_teardown.robot +Resource eacl_tables.robot *** Variables *** ${SYSTEM_KEY} = ${NEOFS_IR_WIF} @@ -119,4 +119,4 @@ Check eACL Сompound Get Range Hash Run Keyword And Expect Error * ... Get object ${KEY} ${CID} ${S_OID_USER} ${EMPTY} local_file_eacl - Get Range Hash ${KEY} ${CID} ${S_OID_USER} ${EMPTY} 0:256 \ No newline at end of file + Get Range Hash ${KEY} ${CID} ${S_OID_USER} ${EMPTY} 0:256 diff --git a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot index 328f6772..348ed0c7 100644 --- a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot +++ b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections Library neofs.py @@ -8,7 +8,7 @@ Library payment_neogo.py Library contract_keywords.py -Resource ../../../variables/eacl_tables.robot +Resource eacl_tables.robot Resource common_steps_acl_bearer.robot Resource payment_operations.robot Resource setup_teardown.robot diff --git a/robot/testsuites/integration/acl/acl_extended_filters.robot b/robot/testsuites/integration/acl/acl_extended_filters.robot index 272057f4..8fa2c223 100644 --- a/robot/testsuites/integration/acl/acl_extended_filters.robot +++ b/robot/testsuites/integration/acl/acl_extended_filters.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library acl.py Library neofs.py @@ -7,9 +7,9 @@ Library payment_neogo.py Library Collections Resource common_steps_acl_extended.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../../../variables/eacl_tables.robot +Resource payment_operations.robot +Resource setup_teardown.robot +Resource eacl_tables.robot *** Variables *** ${PATH} = testfile diff --git a/robot/testsuites/integration/acl/object_attributes/container_id_filter.robot b/robot/testsuites/integration/acl/object_attributes/container_id_filter.robot index 296e960f..a7522c89 100644 --- a/robot/testsuites/integration/acl/object_attributes/container_id_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/container_id_filter.robot @@ -1,15 +1,14 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Container ID Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:containerID eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:containerID eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL containerID Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:containerID diff --git a/robot/testsuites/integration/acl/object_attributes/creation_epoch_filter.robot b/robot/testsuites/integration/acl/object_attributes/creation_epoch_filter.robot index 9acc27ab..b57547b4 100644 --- a/robot/testsuites/integration/acl/object_attributes/creation_epoch_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/creation_epoch_filter.robot @@ -1,16 +1,16 @@ *** Settings *** -Variables ../../../../variables/common.py -Variables ../../../../variables/eacl_object_filters.py +Variables common.py +Variables eacl_object_filters.py Library acl.py Library neofs.py Library Collections Library contract_keywords.py -Resource ../common_steps_acl_extended.robot -Resource ../common_steps_acl_basic.robot -Resource ../../${RESOURCES}/payment_operations.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource common_steps_acl_basic.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${OBJECT_PATH} = testfile diff --git a/robot/testsuites/integration/acl/object_attributes/homomorphic_hash_filter.robot b/robot/testsuites/integration/acl/object_attributes/homomorphic_hash_filter.robot index 3f168139..71b0723d 100644 --- a/robot/testsuites/integration/acl/object_attributes/homomorphic_hash_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/homomorphic_hash_filter.robot @@ -1,17 +1,16 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Homomorphic Hash Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:homomorphicHash eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:homomorphicHash eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL homomorphicHash Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:homomorphicHash - [Teardown] Teardown homomorphic_hash_filter + [Teardown] Teardown homomorphic_hash_filter diff --git a/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot b/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot index 5671178b..3e927909 100644 --- a/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/object_id_filter.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../../variables/common.py -Variables ../../../../variables/eacl_object_filters.py +Variables common.py +Variables eacl_object_filters.py Library acl.py Library neofs.py Library Collections -Resource ../common_steps_acl_extended.robot -Resource ../common_steps_acl_basic.robot -Resource ../../${RESOURCES}/payment_operations.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource common_steps_acl_basic.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${OBJECT_PATH} = testfile diff --git a/robot/testsuites/integration/acl/object_attributes/object_type_filter.robot b/robot/testsuites/integration/acl/object_attributes/object_type_filter.robot index 206e19fa..05a3c3df 100644 --- a/robot/testsuites/integration/acl/object_attributes/object_type_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/object_type_filter.robot @@ -1,17 +1,16 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Object Type Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:objectType eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:objectType eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL objectType Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:objectType - [Teardown] Teardown object_type_filter + [Teardown] Teardown object_type_filter diff --git a/robot/testsuites/integration/acl/object_attributes/owner_id_filter.robot b/robot/testsuites/integration/acl/object_attributes/owner_id_filter.robot index 49783ca4..7a560372 100644 --- a/robot/testsuites/integration/acl/object_attributes/owner_id_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/owner_id_filter.robot @@ -1,19 +1,18 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Owner ID Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:ownerID eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:ownerID eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL ownerID Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:ownerID Log Check eACL ownerID Filter with MatchType String Not Equal Check eACL Filters with MatchType String Not Equal $Object:ownerID - [Teardown] Teardown owner_id_filter + [Teardown] Teardown owner_id_filter diff --git a/robot/testsuites/integration/acl/object_attributes/payload_hash_filter.robot b/robot/testsuites/integration/acl/object_attributes/payload_hash_filter.robot index 2c79f596..cacbdeef 100644 --- a/robot/testsuites/integration/acl/object_attributes/payload_hash_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/payload_hash_filter.robot @@ -1,17 +1,16 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Payload Hash Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:payloadHash eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:payloadHash eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL payloadHash Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:payloadHash - [Teardown] Teardown payload_hash_filter + [Teardown] Teardown payload_hash_filter diff --git a/robot/testsuites/integration/acl/object_attributes/payload_length_filter.robot b/robot/testsuites/integration/acl/object_attributes/payload_length_filter.robot index 5b0c3687..5ab53b17 100644 --- a/robot/testsuites/integration/acl/object_attributes/payload_length_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/payload_length_filter.robot @@ -1,15 +1,15 @@ *** Settings *** -Variables ../../../../variables/common.py -Variables ../../../../variables/eacl_object_filters.py +Variables common.py +Variables eacl_object_filters.py -Library acl.py -Library neofs.py -Library Collections +Library acl.py +Library neofs.py +Library Collections -Resource ../common_steps_acl_extended.robot -Resource ../common_steps_acl_basic.robot -Resource ../../${RESOURCES}/payment_operations.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource common_steps_acl_basic.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${OBJECT_PATH} = testfile diff --git a/robot/testsuites/integration/acl/object_attributes/version_filter.robot b/robot/testsuites/integration/acl/object_attributes/version_filter.robot index 5f1aaeed..3616b354 100644 --- a/robot/testsuites/integration/acl/object_attributes/version_filter.robot +++ b/robot/testsuites/integration/acl/object_attributes/version_filter.robot @@ -1,17 +1,16 @@ *** Settings *** - -Resource ../common_steps_acl_extended.robot -Resource ../../${RESOURCES}/setup_teardown.robot +Resource common_steps_acl_extended.robot +Resource setup_teardown.robot *** Test cases *** Version Object Filter for Extended ACL - [Documentation] Testcase to validate if $Object:version eACL filter is correctly handled. - [Tags] ACL eACL NeoFS NeoCLI - [Timeout] 20 min + [Documentation] Testcase to validate if $Object:version eACL filter is correctly handled. + [Tags] ACL eACL NeoFS NeoCLI + [Timeout] 20 min - [Setup] Setup + [Setup] Setup Log Check eACL version Filter with MatchType String Equal Check eACL Filters with MatchType String Equal $Object:version - [Teardown] Teardown version_filter + [Teardown] Teardown version_filter diff --git a/robot/testsuites/integration/cli/accounting/balance.robot b/robot/testsuites/integration/cli/accounting/balance.robot index c29dde5d..b4a43ec8 100644 --- a/robot/testsuites/integration/cli/accounting/balance.robot +++ b/robot/testsuites/integration/cli/accounting/balance.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../../variables/common.py +Variables common.py Library Collections Library Process diff --git a/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot b/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot index cddf2eb1..267f5e95 100644 --- a/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot +++ b/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../../variables/common.py +Variables common.py Library Collections Library Process diff --git a/robot/testsuites/integration/container/container_attributes.robot b/robot/testsuites/integration/container/container_attributes.robot index bb3b837d..62ed4f2b 100644 --- a/robot/testsuites/integration/container/container_attributes.robot +++ b/robot/testsuites/integration/container/container_attributes.robot @@ -1,14 +1,14 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Collections -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Library String -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../${RESOURCES}/payment_operations.robot -Resource ../acl/common_steps_acl_bearer.robot +Resource setup_teardown.robot +Resource payment_operations.robot +Resource common_steps_acl_bearer.robot *** Variables *** ${POLICY} = REP 2 IN X CBF 1 SELECT 2 FROM * AS X diff --git a/robot/testsuites/integration/container/container_delete.robot b/robot/testsuites/integration/container/container_delete.robot index 33c7dc1f..4fe0aaa3 100644 --- a/robot/testsuites/integration/container/container_delete.robot +++ b/robot/testsuites/integration/container/container_delete.robot @@ -1,6 +1,6 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/container/container_session_token.robot b/robot/testsuites/integration/container/container_session_token.robot index 75e7a770..725e7a7b 100644 --- a/robot/testsuites/integration/container/container_session_token.robot +++ b/robot/testsuites/integration/container/container_session_token.robot @@ -1,14 +1,14 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py Resource setup_teardown.robot Resource payment_operations.robot -Library Process -Library neofs.py -Library String -Library OperatingSystem +Library Process +Library neofs.py +Library String +Library OperatingSystem *** Variables *** ${SIGNED_FILE} = ${ASSETS_DIR}/signed_token.json diff --git a/robot/testsuites/integration/network/netmap_control.robot b/robot/testsuites/integration/network/netmap_control.robot index 53fef078..e028e457 100644 --- a/robot/testsuites/integration/network/netmap_control.robot +++ b/robot/testsuites/integration/network/netmap_control.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library Process Library contract_keywords.py diff --git a/robot/testsuites/integration/network/netmap_control_drop.robot b/robot/testsuites/integration/network/netmap_control_drop.robot index 361bc64f..ad1a02e7 100644 --- a/robot/testsuites/integration/network/netmap_control_drop.robot +++ b/robot/testsuites/integration/network/netmap_control_drop.robot @@ -1,17 +1,17 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py -Library Process -Library contract_keywords.py -Library neofs.py -Library String +Library Process +Library contract_keywords.py +Library neofs.py +Library String -Library payment_neogo.py +Library payment_neogo.py -Resource setup_teardown.robot -Resource payment_operations.robot -Resource storage.robot +Resource setup_teardown.robot +Resource payment_operations.robot +Resource storage.robot *** Variables *** ${CONTAINER_WAIT_INTERVAL} = 1 min diff --git a/robot/testsuites/integration/network/netmap_simple.robot b/robot/testsuites/integration/network/netmap_simple.robot index 1a09670c..2dab40c7 100644 --- a/robot/testsuites/integration/network/netmap_simple.robot +++ b/robot/testsuites/integration/network/netmap_simple.robot @@ -1,13 +1,13 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py Library wallet_keywords.py Library rpc_call_keywords.py -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${CONTAINER_WAIT_INTERVAL} = 1 min diff --git a/robot/testsuites/integration/network/replication.robot b/robot/testsuites/integration/network/replication.robot index 70113505..e8716e80 100644 --- a/robot/testsuites/integration/network/replication.robot +++ b/robot/testsuites/integration/network/replication.robot @@ -1,17 +1,16 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py Library Collections -Library ../${RESOURCES}/payment_neogo.py -Library ../${RESOURCES}/neofs.py +Library payment_neogo.py +Library neofs.py Library wallet_keywords.py Library rpc_call_keywords.py Library contract_keywords.py -Resource ../${RESOURCES}/payment_operations.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource common.robot +Resource payment_operations.robot +Resource setup_teardown.robot *** Variables *** ${PLACEMENT_RULE} = REP 2 IN X CBF 1 SELECT 4 FROM * AS X @@ -38,8 +37,7 @@ NeoFS Object Replication Check Replication [Arguments] ${ACL} - ${WALLET} ${ADDR} ${WIF} = Init Wallet with Address ${ASSETS_DIR} - Payment Operations ${ADDR} ${WIF} + ${WALLET} ${ADDR} ${WIF} = Prepare Wallet And Deposit ${CID} = Create Container ${WIF} ${ACL} ${PLACEMENT_RULE} Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${WIF} ${CID} @@ -81,5 +79,3 @@ Check Replication Sleep ${CHECK_INTERVAL} END Run Keyword Unless ${PASSED} Fail Keyword failed: Validate storage policy for object ${S_OID} in container ${CID} - - [Teardown] Teardown replication diff --git a/robot/testsuites/integration/object/object_attributes.robot b/robot/testsuites/integration/object/object_attributes.robot index 06871e04..34090e20 100644 --- a/robot/testsuites/integration/object/object_attributes.robot +++ b/robot/testsuites/integration/object/object_attributes.robot @@ -1,14 +1,14 @@ *** Settings *** -Variables ../../../variables/common.py -Variables ../../../variables/acl.py +Variables common.py +Variables wellknown_acl.py Library Collections -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Library String -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../${RESOURCES}/payment_operations.robot +Resource setup_teardown.robot +Resource payment_operations.robot *** Variables *** ${POLICY} = REP 2 IN X CBF 1 SELECT 2 FROM * AS X diff --git a/robot/testsuites/integration/object/object_complex.robot b/robot/testsuites/integration/object/object_complex.robot index 80fac17b..e868f4e6 100644 --- a/robot/testsuites/integration/object/object_complex.robot +++ b/robot/testsuites/integration/object/object_complex.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/object/object_expiration.robot b/robot/testsuites/integration/object/object_expiration.robot index ea382866..0377c81c 100644 --- a/robot/testsuites/integration/object/object_expiration.robot +++ b/robot/testsuites/integration/object/object_expiration.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/object/object_simple.robot b/robot/testsuites/integration/object/object_simple.robot index f88a3d7a..bb11d87f 100644 --- a/robot/testsuites/integration/object/object_simple.robot +++ b/robot/testsuites/integration/object/object_simple.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/object/object_storagegroup_complex.robot b/robot/testsuites/integration/object/object_storagegroup_complex.robot index ee1e73cb..5bcdd448 100644 --- a/robot/testsuites/integration/object/object_storagegroup_complex.robot +++ b/robot/testsuites/integration/object/object_storagegroup_complex.robot @@ -1,12 +1,13 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py + Library Collections -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Resource common_steps_object.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../${RESOURCES}/payment_operations.robot +Resource setup_teardown.robot +Resource payment_operations.robot *** Test cases *** NeoFS Complex Storagegroup diff --git a/robot/testsuites/integration/object/object_storagegroup_simple.robot b/robot/testsuites/integration/object/object_storagegroup_simple.robot index b346fba9..fc7c262c 100644 --- a/robot/testsuites/integration/object/object_storagegroup_simple.robot +++ b/robot/testsuites/integration/object/object_storagegroup_simple.robot @@ -1,12 +1,12 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py -Library ../${RESOURCES}/neofs.py -Library ../${RESOURCES}/payment_neogo.py +Library neofs.py +Library payment_neogo.py Resource common_steps_object.robot -Resource ../${RESOURCES}/setup_teardown.robot -Resource ../${RESOURCES}/payment_operations.robot +Resource setup_teardown.robot +Resource payment_operations.robot *** Test cases *** diff --git a/robot/testsuites/integration/payment/withdraw.robot b/robot/testsuites/integration/payment/withdraw.robot index dd7fb659..a02c7240 100644 --- a/robot/testsuites/integration/payment/withdraw.robot +++ b/robot/testsuites/integration/payment/withdraw.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/services/http_gate.robot b/robot/testsuites/integration/services/http_gate.robot index af303eeb..5c1885c5 100644 --- a/robot/testsuites/integration/services/http_gate.robot +++ b/robot/testsuites/integration/services/http_gate.robot @@ -1,5 +1,5 @@ *** Settings *** -Variables ../../../variables/common.py +Variables common.py Library neofs.py Library payment_neogo.py diff --git a/robot/testsuites/integration/services/s3_gate_bucket.robot b/robot/testsuites/integration/services/s3_gate_bucket.robot index adae4586..1636efa3 100644 --- a/robot/testsuites/integration/services/s3_gate_bucket.robot +++ b/robot/testsuites/integration/services/s3_gate_bucket.robot @@ -1,13 +1,14 @@ *** Settings *** -Variables ../../../variables/common.py -Library Collections -Library neofs.py -Library payment_neogo.py -Library gates.py -Library wallet_keywords.py -Library contract_keywords.py +Variables common.py -Resource setup_teardown.robot +Library Collections +Library neofs.py +Library payment_neogo.py +Library gates.py +Library wallet_keywords.py +Library contract_keywords.py + +Resource setup_teardown.robot *** Variables *** ${DEPOSIT_AMOUNT} = ${5} diff --git a/robot/testsuites/integration/services/s3_gate_object.robot b/robot/testsuites/integration/services/s3_gate_object.robot index 4385940b..1c397ccb 100644 --- a/robot/testsuites/integration/services/s3_gate_object.robot +++ b/robot/testsuites/integration/services/s3_gate_object.robot @@ -1,13 +1,15 @@ *** Settings *** -Variables ../../../variables/common.py -Library Collections -Library neofs.py -Library payment_neogo.py -Library gates.py -Library wallet_keywords.py -Library contract_keywords.py +Variables common.py + +Library Collections +Library neofs.py +Library payment_neogo.py +Library gates.py +Library wallet_keywords.py +Library contract_keywords.py + +Resource setup_teardown.robot -Resource setup_teardown.robot *** Variables *** ${DEPOSIT_AMOUNT} = ${5} ${WIF} = ${MAINNET_WALLET_WIF} @@ -74,4 +76,4 @@ Objects in NeoFS S3 Gateway ${LIST_S3_OBJECTS} = List objects S3 ${S3_CLIENT} ${NEW_BUCKET} List Should Not Contain Value ${LIST_S3_OBJECTS} ${FILE_S3_NAME} - [Teardown] Teardown s3_gate_object \ No newline at end of file + [Teardown] Teardown s3_gate_object diff --git a/robot/variables/common.py b/robot/variables/common.py index c6c81937..1eba9c63 100644 --- a/robot/variables/common.py +++ b/robot/variables/common.py @@ -1,8 +1,6 @@ import os ROOT='../..' - -RESOURCES="%s/resources/lib" % ROOT CERT="%s/../../ca" % ROOT # Common NeoFS variables can be declared from neofs-dev-env env variables. diff --git a/robot/variables/acl.py b/robot/variables/wellknown_acl.py similarity index 100% rename from robot/variables/acl.py rename to robot/variables/wellknown_acl.py diff --git a/venv/localtest/environment.sh b/venv/localtest/environment.sh index e96d4af4..fe36f59e 100644 --- a/venv/localtest/environment.sh +++ b/venv/localtest/environment.sh @@ -4,4 +4,4 @@ pushd ../neofs-dev-env export `make env` popd -export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/neofs-keywords/lib:${VIRTUAL_ENV}/neofs-keywords/robot:${VIRTUAL_ENV}/../robot/resources/lib +export PYTHONPATH=${PYTHONPATH}:${VIRTUAL_ENV}/neofs-keywords/lib:${VIRTUAL_ENV}/neofs-keywords/robot:${VIRTUAL_ENV}/../robot/resources/lib/python:${VIRTUAL_ENV}/../robot/resources/lib/robot:${VIRTUAL_ENV}/../robot/variables