From 8edce0f8e27994e5ae7192614fc2087e763b5cfb Mon Sep 17 00:00:00 2001
From: ugaston <ugaston@localhost>
Date: Mon, 17 Nov 2008 14:21:45 +0000
Subject: [PATCH] Fix test framework removing staging data directory before new instance install
---
opends/tests/staf-tests/shared/functions/topology.xml | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
index 4d7844f..0fa5e0b 100755
--- a/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opends/tests/staf-tests/shared/functions/topology.xml
@@ -601,7 +601,18 @@
'foldername' : '%s' % dsDir
}
</call>
+
+ <!--- Delete staging data folder on remote host -->
+ <message>
+ 'Delete staging data folder %s/shared' % dsDir
+ </message>
+ <call function="'deleteFolder'">
+ { 'location' : dsHost,
+ 'foldername' : '%s/testdata' % dsDir
+ }
+ </call>
+
<!--- Copy staging data to remote host -->
<message>
'Copy %s/testdata.zip to %s on %s' % (local.testdata,dsDir,dsHost)
@@ -1654,16 +1665,6 @@
}
</call>
- <!--- Delete staging data folder on remote host -->
- <message>
- 'Delete staging data folder %s/shared' % dsDir
- </message>
- <call function="'deleteFolder'">
- { 'location' : dsHost,
- 'foldername' : '%s/shared' % dsDir
- }
- </call>
-
<!--- Delete OPENDS zip file on remote host-->
<message>
'Delete OPENDS zip file %s/%s' % (dsDir,ZIPNAME)
--
Gitblit v1.10.0