From b6d6b516bb7268e7af2ca1569a00e0437bbcfd06 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Fri, 12 Jan 2007 13:29:05 +0000
Subject: [PATCH] Fix Issue 898 function deletefolder should check folder exist before delete

---
 opends/tests/functional-tests/shared/functions/stafcmd.xml |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/opends/tests/functional-tests/shared/functions/stafcmd.xml b/opends/tests/functional-tests/shared/functions/stafcmd.xml
index 33257be..ca5e155 100755
--- a/opends/tests/functional-tests/shared/functions/stafcmd.xml
+++ b/opends/tests/functional-tests/shared/functions/stafcmd.xml
@@ -313,7 +313,29 @@
 
       <sequence>
 
-        <stafcmd name="'STAF Command: Recursively Delete Folder'">
+      <stafcmd name="'STAF Command: Get Folder Attributes'">
+        <location>'%s' % (hostname)</location>
+        <service>'fs'</service>
+        <request>'GET ENTRY %s TYPE' % (foldername)</request>
+      </stafcmd>
+
+      <if expr="RC == 48">
+        <sequence>
+          <message log="1">
+            'Folder does not exist, do not delete it.'
+          </message>
+          <return>0</return>
+        </sequence>
+        <else>
+          <sequence>
+            <message log="1">
+              'Folder exists, will delete it'
+            </message>
+          </sequence>
+        </else>
+      </if>
+
+      <stafcmd name="'STAF Command: Recursively Delete Folder'">
           <location>'%s' % (hostname)</location>
           <service>'fs'</service>
           <request>

--
Gitblit v1.10.0