From 8cb8f1591a8925f3c2705f5497fbad926ee6e007 Mon Sep 17 00:00:00 2001 From: anastasia prasolova Date: Thu, 19 May 2022 14:49:07 +0300 Subject: [PATCH] storage group tests restructured Signed-off-by: anastasia prasolova --- .../basic_private_container_sg.robot} | 3 ++- .../basic_public_container_sg.robot} | 0 .../basic_readonly_container_sg.robot} | 0 .../bearer_allow_sg.robot} | 0 .../sg_of_complex_objects.robot} | 0 .../sg_of_simple_objects.robot} | 0 6 files changed, 2 insertions(+), 1 deletion(-) rename robot/testsuites/integration/acl/{acl_basic_private_container_storagegroup.robot => storage_group/basic_private_container_sg.robot} (95%) rename robot/testsuites/integration/acl/{acl_basic_public_container_storagegroup.robot => storage_group/basic_public_container_sg.robot} (100%) rename robot/testsuites/integration/acl/{acl_basic_readonly_container_storagegroup.robot => storage_group/basic_readonly_container_sg.robot} (100%) rename robot/testsuites/integration/acl/{acl_bearer_allow_storagegroup.robot => storage_group/bearer_allow_sg.robot} (100%) rename robot/testsuites/integration/object/{object_storagegroup_complex.robot => storage_group/sg_of_complex_objects.robot} (100%) rename robot/testsuites/integration/object/{object_storagegroup_simple.robot => storage_group/sg_of_simple_objects.robot} (100%) diff --git a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot similarity index 95% rename from robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot rename to robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot index 09cb90cf..1805c008 100644 --- a/robot/testsuites/integration/acl/acl_basic_private_container_storagegroup.robot +++ b/robot/testsuites/integration/acl/storage_group/basic_private_container_sg.robot @@ -41,12 +41,13 @@ Check Private Container ${OID} = Put object ${USER_WALLET} ${FILE_S} ${PRIV_CID} @{OBJECTS} = Create List ${OID} + ${SG} = Put Storagegroup ${USER_WALLET} ${PRIV_CID} ${OBJECTS} Run Storage Group Operations And Expect Success ... ${USER_WALLET} ${PRIV_CID} ${OBJECTS} ${RUN_TYPE} Run Storage Group Operations And Expect Failure - ... ${OTHER_WALLET} ${PRIV_CID} ${OBJECTS} ${RUN_TYPE} + ... ${OTHER_WALLET} ${PRIV_CID} ${OBJECTS} ${SG} # In private container, Inner Ring is allowed to read (Storage Group List and Get), # so using here keyword for read-only container. diff --git a/robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot similarity index 100% rename from robot/testsuites/integration/acl/acl_basic_public_container_storagegroup.robot rename to robot/testsuites/integration/acl/storage_group/basic_public_container_sg.robot diff --git a/robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot similarity index 100% rename from robot/testsuites/integration/acl/acl_basic_readonly_container_storagegroup.robot rename to robot/testsuites/integration/acl/storage_group/basic_readonly_container_sg.robot diff --git a/robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot b/robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot similarity index 100% rename from robot/testsuites/integration/acl/acl_bearer_allow_storagegroup.robot rename to robot/testsuites/integration/acl/storage_group/bearer_allow_sg.robot diff --git a/robot/testsuites/integration/object/object_storagegroup_complex.robot b/robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot similarity index 100% rename from robot/testsuites/integration/object/object_storagegroup_complex.robot rename to robot/testsuites/integration/object/storage_group/sg_of_complex_objects.robot diff --git a/robot/testsuites/integration/object/object_storagegroup_simple.robot b/robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot similarity index 100% rename from robot/testsuites/integration/object/object_storagegroup_simple.robot rename to robot/testsuites/integration/object/storage_group/sg_of_simple_objects.robot