From a0df1451348f3354fde8c6f621471544c13a4aad Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Tue, 2 Aug 2022 14:40:05 +0300 Subject: [PATCH] [#271] removed Setup and Teardown from CLI, Container, Network, Payment suites Signed-off-by: anastasia prasolova --- .../acl/storage_group/basic_private_container_sg.robot | 2 -- .../acl/storage_group/basic_public_container_sg.robot | 2 -- .../acl/storage_group/basic_readonly_container_sg.robot | 2 -- .../integration/acl/storage_group/bearer_allow_sg.robot | 2 -- robot/testsuites/integration/cli/accounting/balance.robot | 2 -- .../integration/cli/netmap/networkinfo_rpc_method.robot | 2 -- .../testsuites/integration/container/container_attributes.robot | 2 -- robot/testsuites/integration/container/container_delete.robot | 2 -- .../integration/container/container_session_token.robot | 2 -- robot/testsuites/integration/network/netmap_control.robot | 2 -- robot/testsuites/integration/network/netmap_control_drop.robot | 2 -- robot/testsuites/integration/network/netmap_simple.robot | 2 -- robot/testsuites/integration/network/replication.robot | 2 -- robot/testsuites/integration/payment/emission_threshold.robot | 2 -- robot/testsuites/integration/payment/withdraw.robot | 2 -- 15 files changed, 30 deletions(-) diff --git a/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot index 1ce6001..a7f6cb7 100644 --- a/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot +++ b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot @@ -16,12 +16,10 @@ Basic ACL Operations for Private Container [Tags] ACL [Timeout] 10 min - [Setup] Setup Check Private Container Simple Check Private Container Complex - [Teardown] Teardown acl_basic_private_container_storagegroup *** Keywords *** diff --git a/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot b/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot index 8a5c243..af8adb4 100644 --- a/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot +++ b/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot @@ -16,7 +16,6 @@ Basic ACL Operations for Public Container [Tags] ACL [Timeout] 20 min - [Setup] Setup ${WALLET} ${_} ${_} = Prepare Wallet And Deposit ${WALLET_OTH} ${_} ${_} = Prepare Wallet And Deposit @@ -29,7 +28,6 @@ Basic ACL Operations for Public Container ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check Public Container Complex ${WALLET} ${FILE_S} ${PUBLIC_CID} ${WALLET_OTH} - [Teardown] Teardown acl_basic_public_container_storagegroup *** Keywords *** diff --git a/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot b/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot index 9547638..f1352b3 100644 --- a/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot +++ b/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot @@ -16,12 +16,10 @@ Basic ACL Operations for Read-Only Container [Tags] ACL [Timeout] 20 min - [Setup] Setup Check Read-Only Container Simple Check Read-Only Container Complex - [Teardown] Teardown acl_basic_readonly_container_storagegroup *** Keywords *** diff --git a/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot b/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot index b072305..cc4254c 100644 --- a/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot +++ b/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot @@ -20,7 +20,6 @@ BearerToken Operations [Tags] ACL BearerToken [Timeout] 20 min - [Setup] Setup ${WALLET} ${_} ${_} = Prepare Wallet And Deposit @@ -30,7 +29,6 @@ BearerToken Operations ${FILE_S} ${_} = Generate file ${COMPLEX_OBJ_SIZE} Check eACL Deny and Allow All Bearer Complex ${WALLET} ${FILE_S} - [Teardown] Teardown acl_bearer_allow_storagegroup diff --git a/robot/testsuites/integration/cli/accounting/balance.robot b/robot/testsuites/integration/cli/accounting/balance.robot index 61e397d..69fde83 100644 --- a/robot/testsuites/integration/cli/accounting/balance.robot +++ b/robot/testsuites/integration/cli/accounting/balance.robot @@ -17,7 +17,6 @@ CLI Accounting Balance Test [Documentation] neofs-cli accounting balance test [Timeout] 10 min - [Setup] Setup ${WALLET} ${ADDR} ${_} = Prepare Wallet And Deposit ${DEPOSIT_AMOUNT} @@ -44,7 +43,6 @@ CLI Accounting Balance Test ... shell=True Should Be Equal As Numbers ${OUTPUT.stdout} ${DEPOSIT_AMOUNT} - [Teardown] Teardown cli_accounting_balance *** Keywords *** diff --git a/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot b/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot index 289606f..4152b2a 100644 --- a/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot +++ b/robot/testsuites/integration/cli/netmap/networkinfo_rpc_method.robot @@ -20,7 +20,6 @@ NetworkInfo RPC Method [Tags] RPC NetworkInfo [Timeout] 10 min - [Setup] Setup ###################################################################### # Checking if the command returns equal results for two storage nodes @@ -75,7 +74,6 @@ NetworkInfo RPC Method Should Be Equal ${EPOCH2_S01} ${NEW_EPOCH} - [Teardown] Teardown network_rpc_method *** Keywords *** diff --git a/robot/testsuites/integration/container/container_attributes.robot b/robot/testsuites/integration/container/container_attributes.robot index 7089241..e4c1566 100644 --- a/robot/testsuites/integration/container/container_attributes.robot +++ b/robot/testsuites/integration/container/container_attributes.robot @@ -21,7 +21,6 @@ Duplicated Container Attributes [Tags] Container [Timeout] 5 min - [Setup] Setup ${WALLET} ${_} ${_} = Prepare Wallet And Deposit @@ -58,4 +57,3 @@ Duplicated Container Attributes ... ${ATTR_SINGLE} ... msg="No expected container attributes found" - [Teardown] Teardown container_attributes diff --git a/robot/testsuites/integration/container/container_delete.robot b/robot/testsuites/integration/container/container_delete.robot index 7111611..babf112 100644 --- a/robot/testsuites/integration/container/container_delete.robot +++ b/robot/testsuites/integration/container/container_delete.robot @@ -20,7 +20,6 @@ Delete Containers [Tags] Container [Timeout] 3 min - [Setup] Setup ${WALLET} ... ${_} @@ -55,4 +54,3 @@ Delete Containers ################################################################################### Delete Container ${WALLET} ${CID} - [Teardown] Teardown container_delete diff --git a/robot/testsuites/integration/container/container_session_token.robot b/robot/testsuites/integration/container/container_session_token.robot index 817a785..7e577ed 100644 --- a/robot/testsuites/integration/container/container_session_token.robot +++ b/robot/testsuites/integration/container/container_session_token.robot @@ -14,7 +14,6 @@ Session Token for Container [Tags] Container SessionToken [Timeout] 5 min - [Setup] Setup ${OWNER_WALLET} ${OWNER} ${_} = Prepare Wallet And Deposit ${SESSION_WALLET} ${_} ${_} = Prepare Wallet And Deposit @@ -32,4 +31,3 @@ Session Token for Container &{ATTRS} = Get Container ${SESSION_WALLET} ${CID} Should Be Equal As Strings ${OWNER} ${ATTRS}[ownerID] - [Teardown] Teardown container_session_token diff --git a/robot/testsuites/integration/network/netmap_control.robot b/robot/testsuites/integration/network/netmap_control.robot index f22a7b7..43acb77 100644 --- a/robot/testsuites/integration/network/netmap_control.robot +++ b/robot/testsuites/integration/network/netmap_control.robot @@ -15,7 +15,6 @@ Control Operations with storage nodes [Documentation] Testcase to check NetworkInfo control command. [Timeout] 5 min - [Setup] Setup ${NODE_NUM} ${NODE} ${STORAGE_WALLET} = Get control endpoint and wallet ${empty_list} = Create List @@ -50,4 +49,3 @@ Control Operations with storage nodes Should Be Equal As Integers ${HEALTHCHECK_ONLINE.rc} 0 Should Be Equal ${HEALTHCHECK.stdout} ${HEALTHCHECK_ONLINE.stdout} - [Teardown] Teardown netmap_control diff --git a/robot/testsuites/integration/network/netmap_control_drop.robot b/robot/testsuites/integration/network/netmap_control_drop.robot index 277026f..3f9f26c 100644 --- a/robot/testsuites/integration/network/netmap_control_drop.robot +++ b/robot/testsuites/integration/network/netmap_control_drop.robot @@ -17,7 +17,6 @@ Drop command in control group [Documentation] Testcase to check drop-objects command from control group. [Timeout] 10 min - [Setup] Setup ${_} ${NODE} ${STORAGE_WALLET}= Get control endpoint and wallet ${LOCODE} = Get Locode @@ -76,4 +75,3 @@ Drop command in control group ... Head object ${WALLET} ${PRIV_CID} ${C_OID} options=--ttl 1 - [Teardown] Teardown netmap_control_drop diff --git a/robot/testsuites/integration/network/netmap_simple.robot b/robot/testsuites/integration/network/netmap_simple.robot index d66915f..9fa92ae 100644 --- a/robot/testsuites/integration/network/netmap_simple.robot +++ b/robot/testsuites/integration/network/netmap_simple.robot @@ -15,7 +15,6 @@ NeoFS Simple Netmap [Tags] Netmap [Timeout] 20 min - [Setup] Setup ${WALLET} ${_} ${_} = Prepare Wallet And Deposit @@ -69,7 +68,6 @@ NeoFS Simple Netmap ... Validate Selected Nodes ${WALLET} REP 2 IN X CBF 2 SELECT 6 FROM * AS X 2 Should Contain ${ERR} code = 1024 message = netmap: not enough nodes to SELECT from - [Teardown] Teardown netmap_simple *** Keywords *** diff --git a/robot/testsuites/integration/network/replication.robot b/robot/testsuites/integration/network/replication.robot index 1862e01..23ad939 100644 --- a/robot/testsuites/integration/network/replication.robot +++ b/robot/testsuites/integration/network/replication.robot @@ -23,14 +23,12 @@ NeoFS Object Replication [Tags] Migration Replication [Timeout] 25 min - [Setup] Setup Log Check replication mechanism Check Replication Log Check Sticky Bit with SYSTEM Group via replication mechanism Check Replication ${STICKYBIT_PUB_ACL} - [Teardown] Teardown replication *** Keywords *** Check Replication diff --git a/robot/testsuites/integration/payment/emission_threshold.robot b/robot/testsuites/integration/payment/emission_threshold.robot index 07728c0..6d77cc6 100644 --- a/robot/testsuites/integration/payment/emission_threshold.robot +++ b/robot/testsuites/integration/payment/emission_threshold.robot @@ -20,7 +20,6 @@ IR GAS emission threshold value [Tags] GAS Sidechain [Timeout] 5 min - [Setup] Setup ${WALLET} ${ADDR} ${_} = Generate Wallet @@ -50,4 +49,3 @@ IR GAS emission threshold value ${BALANCE_UNCHANGED} = Get Sidechain Balance ${ADDR} Should Be Equal ${BALANCE_UNCHANGED} ${BALANCE_CHANGED} - [Teardown] Teardown emission_threshold diff --git a/robot/testsuites/integration/payment/withdraw.robot b/robot/testsuites/integration/payment/withdraw.robot index 5c5346f..3842631 100644 --- a/robot/testsuites/integration/payment/withdraw.robot +++ b/robot/testsuites/integration/payment/withdraw.robot @@ -16,7 +16,6 @@ NeoFS Deposit and Withdraw [Documentation] Testcase to validate NeoFS Withdraw operation. [Timeout] 10 min - [Setup] Setup ${WALLET} ${ADDR} ${_} = Generate Wallet @@ -55,4 +54,3 @@ NeoFS Deposit and Withdraw ${MAINNET_BALANCE_DIFF} = Evaluate ${MAINNET_BALANCE_AFTER} - ${MAINNET_BALANCE} Should Be True ${MAINNET_BALANCE_DIFF} < ${WITHDRAW_AMOUNT} - [Teardown] Teardown withdraw