From 8116ada7b671ed29bb560367d652cc67c0142372 Mon Sep 17 00:00:00 2001 From: Elizaveta Chichindaeva Date: Tue, 24 May 2022 18:00:26 +0300 Subject: [PATCH] [#195] Get rid off Prepare Container Signed-off-by: Elizaveta Chichindaeva --- .../lib/robot/common_steps_object.robot | 20 ------------------- .../integration/object/object_complex.robot | 6 +++--- .../object/object_expiration.robot | 6 +++--- .../integration/object/object_simple.robot | 6 +++--- .../storage_group/sg_of_complex_objects.robot | 6 +++--- .../storage_group/sg_of_simple_objects.robot | 6 +++--- 6 files changed, 15 insertions(+), 35 deletions(-) delete mode 100644 robot/resources/lib/robot/common_steps_object.robot diff --git a/robot/resources/lib/robot/common_steps_object.robot b/robot/resources/lib/robot/common_steps_object.robot deleted file mode 100644 index e88801f..0000000 --- a/robot/resources/lib/robot/common_steps_object.robot +++ /dev/null @@ -1,20 +0,0 @@ -*** Settings *** -Variables common.py - -Library container.py -Library wallet_keywords.py -Library rpc_call_keywords.py - -*** Keywords *** - -Prepare container - [Arguments] ${WIF} ${WALLET} - ${NEOFS_BALANCE} = Get NeoFS Balance ${WIF} - ${CID} = Create container ${WALLET} - - ${NEW_NEOFS_BALANCE} = Get NeoFS Balance ${WIF} - Should Be True ${NEW_NEOFS_BALANCE} < ${NEOFS_BALANCE} - ${CONTAINER_FEE} = Evaluate ${NEOFS_BALANCE} - ${NEW_NEOFS_BALANCE} - Log Container fee is ${CONTAINER_FEE} - - [Return] ${CID} diff --git a/robot/testsuites/integration/object/object_complex.robot b/robot/testsuites/integration/object/object_complex.robot index 3b9ea98..5b13974 100644 --- a/robot/testsuites/integration/object/object_complex.robot +++ b/robot/testsuites/integration/object/object_complex.robot @@ -2,13 +2,13 @@ Variables common.py Library neofs_verbs.py +Library container.py Library complex_object_actions.py Library neofs.py Library contract_keywords.py Library Collections Library utility_keywords.py -Resource common_steps_object.robot Resource setup_teardown.robot Resource payment_operations.robot @@ -27,8 +27,8 @@ NeoFS Complex Object Operations [Setup] Setup - ${WALLET} ${ADDR} ${WIF} = Prepare Wallet And Deposit - ${CID} = Prepare container ${WIF} ${WALLET} + ${WALLET} ${ADDR} ${_} = Prepare Wallet And Deposit + ${CID} = Create container ${WALLET} ${FILE} ${FILE_HASH} = Generate file ${COMPLEX_OBJ_SIZE} diff --git a/robot/testsuites/integration/object/object_expiration.robot b/robot/testsuites/integration/object/object_expiration.robot index 9e2dad8..eb565c3 100644 --- a/robot/testsuites/integration/object/object_expiration.robot +++ b/robot/testsuites/integration/object/object_expiration.robot @@ -2,10 +2,10 @@ Variables common.py Library neofs_verbs.py +Library container.py Library contract_keywords.py Library utility_keywords.py -Resource common_steps_object.robot Resource setup_teardown.robot Resource payment_operations.robot @@ -20,8 +20,8 @@ NeoFS Simple Object Operations [Setup] Setup - ${WALLET} ${_} ${WIF} = Prepare Wallet And Deposit - ${CID} = Prepare container ${WIF} ${WALLET} + ${WALLET} ${_} ${_} = Prepare Wallet And Deposit + ${CID} = Create container ${WALLET} ${FILE} ${FILE_HASH} = Generate File ${SIMPLE_OBJ_SIZE} ${EPOCH} = Get Epoch diff --git a/robot/testsuites/integration/object/object_simple.robot b/robot/testsuites/integration/object/object_simple.robot index f20b031..9ae4b3f 100644 --- a/robot/testsuites/integration/object/object_simple.robot +++ b/robot/testsuites/integration/object/object_simple.robot @@ -3,11 +3,11 @@ Variables common.py Library neofs.py Library neofs_verbs.py +Library container.py Library contract_keywords.py Library Collections Library utility_keywords.py -Resource common_steps_object.robot Resource payment_operations.robot Resource setup_teardown.robot @@ -25,8 +25,8 @@ NeoFS Simple Object Operations [Setup] Setup - ${WALLET} ${ADDR} ${WIF} = Prepare Wallet And Deposit - ${CID} = Prepare container ${WIF} ${WALLET} + ${WALLET} ${ADDR} ${_} = Prepare Wallet And Deposit + ${CID} = Create container ${WALLET} ${FILE} ${FILE_HASH} = Generate file ${SIMPLE_OBJ_SIZE} diff --git a/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot b/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot index b719cdb..4bff7e4 100644 --- a/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot +++ b/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot @@ -2,12 +2,12 @@ Variables common.py Library neofs.py +Library container.py Library neofs_verbs.py Library storage_group.py Library Collections Library utility_keywords.py -Resource common_steps_object.robot Resource setup_teardown.robot Resource payment_operations.robot Resource storage_group.robot @@ -23,8 +23,8 @@ NeoFS Complex Storagegroup [Setup] Setup - ${WALLET} ${_} ${WIF} = Prepare Wallet And Deposit - ${CID} = Prepare container ${WIF} ${WALLET} + ${WALLET} ${_} ${_} = Prepare Wallet And Deposit + ${CID} = Create container ${WALLET} ${FILE} ${_} = Generate file ${COMPLEX_OBJ_SIZE} diff --git a/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot b/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot index aed4566..ca33708 100644 --- a/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot +++ b/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot @@ -2,10 +2,10 @@ Variables common.py Library neofs_verbs.py +Library container.py Library storage_group.py Library utility_keywords.py -Resource common_steps_object.robot Resource setup_teardown.robot Resource payment_operations.robot Resource storage_group.robot @@ -21,8 +21,8 @@ NeoFS Simple Storagegroup [Setup] Setup - ${WALLET} ${_} ${WIF} = Prepare Wallet And Deposit - ${CID} = Prepare container ${WIF} ${WALLET} + ${WALLET} ${_} ${_} = Prepare Wallet And Deposit + ${CID} = Create container ${WALLET} ${FILE_S} ${_} = Generate file ${SIMPLE_OBJ_SIZE}