From 98437c5dc5fa2e291dec0a9a7c7fab281bf76722 Mon Sep 17 00:00:00 2001
From: Nassim Babaci <nassim.babaci@cloudwatt.com>
Date: Tue, 3 Jun 2014 13:29:42 +0200
Subject: [PATCH] shell test small print enhancements

---
 tests/test_CWpolicy.sh | 411 ++++++++++++++++++++++++++++-------------
 1 file changed, 281 insertions(+), 130 deletions(-)

diff --git a/tests/test_CWpolicy.sh b/tests/test_CWpolicy.sh
index df0b7c9..11efbc0 100755
--- a/tests/test_CWpolicy.sh
+++ b/tests/test_CWpolicy.sh
@@ -15,149 +15,300 @@ CW_ROLE2=remove_only
 CW_USER=cwuser
 CW_SUPPORT=support
 
-# Create users, tenant, roles
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone tenant-create --name $CW_USER
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_ROLE1
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_ROLE2
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_SUPPORT
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-create --name $CW_USER --tenant $CW_USER --pass $CW_USER --enabled true
-# support user
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-create --name $CW_SUPPORT --pass $CW_SUPPORT --enabled true
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_SUPPORT --tenant $CW_USER --role $CW_SUPPORT
+setup () {
+    echo "***** SETUP ****"
+    echo ">> Create users, tenant and roles"
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone tenant-create --name $CW_USER 2>&1 >/dev/null
 
-# Let's do regular stuff first
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role Member
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_ROLE1 2>&1 >/dev/null
 
-echo "testy test" > testytest
-echo "* Regular user"
-echo "Testing uploading an object/container"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj1 container1 testytest
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj1 todelete testytest
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj2 todelete testytest
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj3 todelete testytest
-echo "Testing list and stat"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift list container1 
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift stat
-echo "Testing deleting delobj3"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj3
-echo "Testing download - object"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1
-echo "Testing download - container"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_ROLE2 2>&1 >/dev/null
 
-echo ""
-# Now prevent uploads
-echo "Applying $CW_ROLE1"
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role $CW_ROLE1
-echo "* Testing upload"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest
-if [ $? -ne 0 ]; then
-    echo "Upload forbidden, all good"
-else
-    echo "FAIL - User can upload data"
-fi;
-# pass
-echo "* Testing listing container1"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift list container1
-# pass
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift stat
-# pass
-echo "* Testing deletion"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj2
-# pass
-echo "* Testing download - object"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1
-echo "* Testing download - container"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-create --name $CW_SUPPORT 2>&1 >/dev/null
 
-echo ""
-# Now authorize file removal only
-echo "Applying $CW_ROLE2"
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-role-remove --user $CW_USER --tenant $CW_USER --role $CW_ROLE1
-OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role $CW_ROLE2
-echo "* Testing upload"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest
-if [ $? -ne 0 ]; then
-    echo "Upload forbidden, all good"
-else
-    echo "FAIL - User can upload data"
-fi;
-# pass
-echo "* Testing listing container1"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift list container1
-# pass
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift stat
-# pass
-echo "* Testing deleting delobj1"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj1
-# fail
-echo "* Testing downloading object"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1
-if [ $? -ne 0 ]; then
-    echo "Download forbidden, all good"
-else
-    echo "FAIL - User can download data"
-fi;
-echo "* Testing downloading container"
-OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift download container1
-if [ $? -ne 0 ]; then
-    echo "Download forbidden, all good"
-else
-    echo "FAIL - User can download data"
-fi;
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-create --name $CW_USER --tenant $CW_USER --pass $CW_USER --enabled true 2>&1 >/dev/null
+
+    echo ">> Create support user"
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-create --name $CW_SUPPORT --pass $CW_SUPPORT --enabled true 2>&1 >/dev/null
+
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_SUPPORT --tenant $CW_USER --role $CW_SUPPORT 2>&1 >/dev/null
+
+    # Let's do regular stuff first
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role Member 2>&1 >/dev/null
+}
+
+tests () {
+
+    echo "***** TESTS ****"
+    echo "testy test" > testytest
+    echo "*** Regular user - $CW_USER ***"
+
+    echo ">> Testing uploading an object/container"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj1 container1 testytest 2>&1 >/dev/null
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj1 todelete testytest 2>&1 >/dev/null
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj2 todelete testytest 2>&1 >/dev/null
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name delobj3 todelete testytest 2>&1 >/dev/null
+
+    echo ">> Testing list and stat"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift list container1 2>&1 >/dev/null
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift stat 2>&1 >/dev/null
+
+    echo ">> Testing deleting delobj3"
+    OS_USERNAME=$CW_USER OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_USER OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj3
+
+    echo ">> Testing download - object"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1 2>&1 >/dev/null
+
+    echo ">> Testing download - container"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 2>&1 >/dev/null
+
+    echo ""
+    echo "*** Now prevent uploads ***"
+    echo ">> Applying $CW_ROLE1"
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role $CW_ROLE1 2>&1 >/dev/null
+    echo ">> Testing upload"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Upload forbidden, all good"
+    else
+        echo "... FAIL - User can upload data"
+    fi;
+    # pass
+    echo ">> Testing listing container1"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift list container1 2>&1 >/dev/null
+    # pass
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift stat 2>&1 >/dev/null
+    # pass
+    echo ">> Testing deletion"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj2 2>&1 >/dev/null
+    # pass
+    echo ">> Testing download - object"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1 2>&1 >/dev/null
+    echo ">> Testing download - container"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 2>&1 >/dev/null
+
+    echo ""
+    echo "*** Now authorize file removal only ***"
+    echo ">> Applying $CW_ROLE2"
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-role-remove --user $CW_USER --tenant $CW_USER --role $CW_ROLE1 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-role-add --user $CW_USER --tenant $CW_USER --role $CW_ROLE2 2>&1 >/dev/null
+
+    echo ">> Testing upload"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Upload forbidden, all good"
+    else
+        echo "... FAIL - User can upload data"
+    fi;
+    # pass
+    echo ">> Testing listing container1"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift list container1 2>&1 >/dev/null
+    # pass
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift stat
+    # pass
+    echo ">> Testing deleting delobj1"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj1 2>&1 >/dev/null
+    # fail
+    echo ">> Testing downloading object"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Download forbidden, all good"
+    else
+        echo "... FAIL - User can download data"
+    fi;
+    echo ">> Testing downloading container"
+    OS_USERNAME=$CW_USER \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_USER \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Download forbidden, all good"
+    else
+        echo "... FAIL - User can download data"
+    fi;
 
 
-echo ""
-# Testing support access
-echo "Testing support user"
-echo "* Testing upload"
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest
-if [ $? -ne 0 ]; then
-    echo "Upload forbidden, all good"
-else
-    echo "FAIL - User can upload data"
-fi;
-# pass
-echo "* Testing listing container1"
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift list container1
-# pass
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift stat
-# fail
-echo "* Testing deleting delobj1"
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj1
-if [ $? -ne 0 ]; then
-    echo "Delete forbidden, all good"
-else
-    echo "FAIL - User can delete data"
-fi;
-# fail
-echo "* Testing downloading object"
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1
-if [ $? -ne 0 ]; then
-    echo "Download forbidden, all good"
-else
-    echo "FAIL - User can download data"
-fi;
-echo "* Testing downloading container"
-OS_USERNAME=$CW_SUPPORT OS_TENANT_NAME=$CW_USER OS_PASSWORD=$CW_SUPPORT OS_AUTH_URL=$OS_AUTH_URL swift download container1
-if [ $? -ne 0 ]; then
-    echo "Download forbidden, all good"
-else
-    echo "FAIL - User can download data"
-fi;
+    echo ""
+    echo "*** Testing support user ***"
+    echo ">> Testing upload"
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift upload --object-name obj2 container1 testytest 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Upload forbidden, all good"
+    else
+        echo "... FAIL - User can upload data"
+    fi;
+    # pass
+    echo ">> Testing listing container1"
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift list container1 2>&1 >/dev/null
+    # pass
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift stat 2>&1 >/dev/null
+    # fail
+    echo ">> Testing deleting delobj1"
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift delete todelete delobj1 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Delete forbidden, all good"
+    else
+        echo "... FAIL - User can delete data"
+    fi;
+    # fail
+    echo ">> Testing downloading object"
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 obj1 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Download forbidden, all good"
+    else
+        echo "... FAIL - User can download data"
+    fi;
+    echo ">> Testing downloading container"
+    OS_USERNAME=$CW_SUPPORT \
+    OS_TENANT_NAME=$CW_USER \
+    OS_PASSWORD=$CW_SUPPORT \
+    OS_AUTH_URL=$OS_AUTH_URL swift download container1 2>&1 >/dev/null
+    if [ $? -ne 0 ]; then
+        echo "... Download forbidden, all good"
+    else
+        echo "... FAIL - User can download data"
+    fi;
+}
 
 
 # cleanup
 cleanup () {
+    echo "**** CLEANUP *****"
     rm testytest obj1
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-delete $CW_SUPPORT
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone user-delete $CW_USER
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone tenant-delete $CW_USER
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_ROLE1
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_ROLE2
-    OS_USERNAME=$OS_ADMIN OS_TENANT_NAME=$OS_ADMIN_TENANT OS_PASSWORD=$OS_ADMIN_PASSWORD OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_SUPPORT
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-delete $CW_SUPPORT 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone user-delete $CW_USER 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone tenant-delete $CW_USER 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_ROLE1 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_ROLE2 2>&1 >/dev/null
+    OS_USERNAME=$OS_ADMIN \
+    OS_TENANT_NAME=$OS_ADMIN_TENANT \
+    OS_PASSWORD=$OS_ADMIN_PASSWORD \
+    OS_AUTH_URL=$OS_AUTH_URL keystone role-delete $CW_SUPPORT 2>&1 >/dev/null
 }
 
+setup
+tests
+
 if [ "$CLEANUP" = "true" ]
 then
     cleanup