From aeeeb89bdf1411c951c403f8fd6db5a8bb90a37a Mon Sep 17 00:00:00 2001
From: Nassim Babaci <nassim.babaci@cloudwatt.com>
Date: Tue, 3 Jun 2014 11:46:38 +0200
Subject: [PATCH] add cleanup option

---
 tests/test_CWpolicy.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/tests/test_CWpolicy.sh b/tests/test_CWpolicy.sh
index 5225aae..c25feb6 100755
--- a/tests/test_CWpolicy.sh
+++ b/tests/test_CWpolicy.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+CLEANUP=${CLEANUP-true}
 # assuming a devstack with the following parameters, where swiftpolicy mw
 # was added to the swift pipeline and using CWpolicy.json
 
@@ -88,8 +89,15 @@ fi;
 
 
 # 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_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
+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_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
+}
+
+if [ "$CLEANUP" = "true" ]
+then
+    cleanup
+fi