From e14ba001a95af75705b08743c55607afafea5849 Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Mon, 1 Nov 2021 13:12:55 +0300 Subject: [PATCH] nspcc-dev/neofs-testcases#143: error message extended Signed-off-by: anastasia prasolova --- robot/resources/lib/storage.robot | 9 ++++----- .../acl/acl_extended_deny_replication.robot | 13 ++++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/robot/resources/lib/storage.robot b/robot/resources/lib/storage.robot index 35d10b91..f53db0f1 100644 --- a/robot/resources/lib/storage.robot +++ b/robot/resources/lib/storage.robot @@ -9,8 +9,7 @@ Library Process Drop object [Arguments] ${NODE} ${WIF_STORAGE} ${CID} ${OID} - ${DROP_SIMPLE} = Run Process neofs-cli control drop-objects --endpoint ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID} shell=True - Log Many stdout: ${DROP_SIMPLE.stdout} stderr: ${DROP_SIMPLE.stderr} - Should Be Equal As Integers ${DROP_SIMPLE.rc} 0 - - + ${DROP_SIMPLE} = Run Process neofs-cli control drop-objects --rpc-endpoint ${NODE} --wif ${WIF_STORAGE} -o ${CID}/${OID} + ... shell=True + Log Many stdout: ${DROP_SIMPLE.stdout} stderr: ${DROP_SIMPLE.stderr} + Should Be Equal As Integers ${DROP_SIMPLE.rc} 0 Got non-zero return code from CLI diff --git a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot index 3b1f6d4d..328f6772 100644 --- a/robot/testsuites/integration/acl/acl_extended_deny_replication.robot +++ b/robot/testsuites/integration/acl/acl_extended_deny_replication.robot @@ -27,17 +27,17 @@ eACL Deny Replication Operations [Setup] Setup - ${NODE_NUM} ${NODE} ${WIF_STORAGE} = Get control endpoint with wif - ${WALLET} ${ADDR} ${WIF_USER} = Prepare Wallet And Deposit + ${NODE_NUM} ${NODE} ${WIF_STORAGE} = Get control endpoint with wif + ${WALLET} ${ADDR} ${WIF_USER} = Prepare Wallet And Deposit Prepare eACL Role rules Log Check Replication with eACL deny - object should be replicated # https://github.com/nspcc-dev/neofs-node/issues/881 - + ${FILE} = Generate file of bytes ${SIMPLE_OBJ_SIZE} - - ${CID} = Create container ${WIF_USER} 0x0FFFFFFF ${FULL_PLACEMENT_RULE} + + ${CID} = Create container ${WIF_USER} 0x0FFFFFFF ${FULL_PLACEMENT_RULE} Wait Until Keyword Succeeds ${MORPH_BLOCK_TIME} ${CONTAINER_WAIT_INTERVAL} ... Container Existing ${WIF_USER} ${CID} @@ -49,7 +49,7 @@ eACL Deny Replication Operations Run Keyword And Expect Error * ... Put object ${WIF_USER} ${FILE} ${CID} ${EMPTY} ${FILE_USR_HEADER} - + # Drop object to check replication Drop object ${NODE} ${WIF_STORAGE} ${CID} ${OID} @@ -60,4 +60,3 @@ eACL Deny Replication Operations ... Validate storage policy for object ${WIF_STORAGE} ${EXPECTED_COPIES} ${CID} ${OID} [Teardown] Teardown acl_deny_replication -