From 013bce8c6aef97002afcd67c44dbcabeb7635aef Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Wed, 11 Jun 2008 16:15:03 +0000
Subject: [PATCH] Update installation path and tools path in setup testsuite
---
opends/tests/functional-tests/testcases/setup/misc.xml | 2 +-
opends/tests/functional-tests/testcases/setup/ports.xml | 4 ++--
opends/tests/functional-tests/testcases/setup/directory_manager.xml | 20 ++++++++++----------
opends/tests/functional-tests/testcases/setup/security.xml | 24 ++++++++++++------------
opends/tests/functional-tests/testcases/setup/import.xml | 4 ++--
opends/tests/functional-tests/testcases/setup/setup.xml | 2 +-
opends/tests/functional-tests/testcases/setup/_pre.xml | 2 +-
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/opends/tests/functional-tests/testcases/setup/_pre.xml b/opends/tests/functional-tests/testcases/setup/_pre.xml
index 5479eb0..9640c36 100644
--- a/opends/tests/functional-tests/testcases/setup/_pre.xml
+++ b/opends/tests/functional-tests/testcases/setup/_pre.xml
@@ -107,7 +107,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, ODS_UNZIPPED)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, ODS_UNZIPPED)
}
</call>
diff --git a/opends/tests/functional-tests/testcases/setup/directory_manager.xml b/opends/tests/functional-tests/testcases/setup/directory_manager.xml
index 5fd2db5..046104d 100644
--- a/opends/tests/functional-tests/testcases/setup/directory_manager.xml
+++ b/opends/tests/functional-tests/testcases/setup/directory_manager.xml
@@ -157,7 +157,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, DM_I1_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, DM_I1_BASE)
}
</call>
@@ -214,7 +214,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, DM_I2_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, DM_I2_BASE)
}
</call>
@@ -252,7 +252,7 @@
is setup -->
<message>'Configure replication between I1 - I2 on o=o1'</message>
<script>
- c = '%s/bin/dsconfig%s' % (DM_I1_ROOT, fileExt)
+ c = '%s/%s/dsconfig%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "cn=directory manager"')
p.append('--bindPassword kangourou --port %s' % (DM_I1_PORT))
@@ -275,7 +275,7 @@
</call>
<script>
- c = '%s/bin/dsconfig%s' % (DM_I2_ROOT, fileExt)
+ c = '%s/%s/dsconfig%s' % (DM_I2_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "cn=DM" --bindPassword kangourou')
p.append('--port %s --backend-name o1' % DM_I2_PORT)
@@ -300,7 +300,7 @@
</call>
<script>
- c = '%s/bin/import-ldif%s' % (DM_I1_ROOT, fileExt)
+ c = '%s/%s/import-ldif%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--bindDN "cn=directory manager" --bindPassword kangourou')
p.append('--port %s --backendID o1' % DM_I1_PORT)
@@ -321,7 +321,7 @@
</call>
<script>
- c = '%s/bin/dsreplication%s' % (DM_I1_ROOT, fileExt)
+ c = '%s/%s/dsreplication%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('enable --host1 %s' % STAF_REMOTE_HOSTNAME)
p.append('--bindDN1 "cn=directory manager"')
@@ -350,7 +350,7 @@
</call>
<script>
- c = '%s/bin/dsreplication%s' % (DM_I1_ROOT, fileExt)
+ c = '%s/%s/dsreplication%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('initialize -I admin -w secret12 --baseDN "o=o1"')
p.append('--hostSource %s' % STAF_REMOTE_HOSTNAME)
@@ -377,7 +377,7 @@
<!-- 4. Backup I1 & I2 and copy LDIF files in I1 & I2 -->
<message>'Backup I1 and I2 - copy LDIF files in I1 and I2'</message>
<script>
- c = '%s/bin/backup%s' % (DM_I1_ROOT, fileExt)
+ c = '%s/%s/backup%s' % (DM_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--backendID o1 --port %s' % DM_I1_PORT)
p.append('--bindDN "cn=directory manager"')
@@ -399,7 +399,7 @@
</call>
<script>
- c = '%s/bin/backup%s' % (DM_I2_ROOT, fileExt)
+ c = '%s/%s/backup%s' % (DM_I2_ROOT, fileFolder, fileExt)
p = []
p.append('--backendID o1 --port %s' % DM_I2_PORT)
p.append('--bindDN "cn=DM" --bindPassword "kangourou"')
@@ -636,7 +636,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, DM_I3_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, DM_I3_BASE)
}
</call>
diff --git a/opends/tests/functional-tests/testcases/setup/import.xml b/opends/tests/functional-tests/testcases/setup/import.xml
index 21a8e5e..d945937 100644
--- a/opends/tests/functional-tests/testcases/setup/import.xml
+++ b/opends/tests/functional-tests/testcases/setup/import.xml
@@ -127,7 +127,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, IMP_I1_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, IMP_I1_BASE)
}
</call>
@@ -306,7 +306,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, IMP_I2_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, IMP_I2_BASE)
}
</call>
diff --git a/opends/tests/functional-tests/testcases/setup/misc.xml b/opends/tests/functional-tests/testcases/setup/misc.xml
index 9359dac..998cdde 100644
--- a/opends/tests/functional-tests/testcases/setup/misc.xml
+++ b/opends/tests/functional-tests/testcases/setup/misc.xml
@@ -120,7 +120,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, MISC_I1_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, MISC_I1_BASE)
}
</call>
diff --git a/opends/tests/functional-tests/testcases/setup/ports.xml b/opends/tests/functional-tests/testcases/setup/ports.xml
index b3f6c92..f5c8a14 100644
--- a/opends/tests/functional-tests/testcases/setup/ports.xml
+++ b/opends/tests/functional-tests/testcases/setup/ports.xml
@@ -260,7 +260,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, PORTS_I1_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, PORTS_I1_BASE)
}
</call>
@@ -293,7 +293,7 @@
</call>
<script>
- c = '%s/bin/start-ds%s' % (PORTS_I1_ROOT, fileExt)
+ c = '%s/%s/start-ds%s' % (PORTS_I1_ROOT, fileFolder, fileExt)
p = []
p = ' '.join(p)
</script>
diff --git a/opends/tests/functional-tests/testcases/setup/security.xml b/opends/tests/functional-tests/testcases/setup/security.xml
index 99bf26b..771413c 100644
--- a/opends/tests/functional-tests/testcases/setup/security.xml
+++ b/opends/tests/functional-tests/testcases/setup/security.xml
@@ -176,7 +176,7 @@
'service' : 'ZIP',
'request' : 'UNZIP',
'arguments' : 'ZIPFILE %s/%s TODIRECTORY %s RESTOREPERMISSION' \
- % (ZIPPATH, ZIPNAME, SEC_I1_BASE)
+ % (DIRECTORY_INSTANCE_DIR, ZIPNAME, SEC_I1_BASE)
}
</call>
@@ -213,7 +213,7 @@
<!-- 1.2. Check I1 -->
<message>'++ Check status of I1'</message>
<script>
- c = '%s/bin/status%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/status%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--no-prompt')
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
@@ -347,7 +347,7 @@
<!-- 2.2. Check I2 -->
<message>'++ Check status of I2'</message>
<script>
- c = '%s/bin/status%s' % (SEC_I2_ROOT, fileExt)
+ c = '%s/%s/status%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
p.append('--no-prompt')
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
@@ -422,7 +422,7 @@
<!-- 3.1. Config: create backend I1 -->
<message>'++ create backend on I1'</message>
<script>
- c = '%s/bin/dsconfig%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/dsconfig%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "%s"' % DM_DN)
p.append('--bindPassword "%s" --port %s' % (DM_PW, SEC_I1_PORT))
@@ -447,7 +447,7 @@
<!-- 3.2. Config: create backend I2 -->
<message>'++ create backend on I2'</message>
<script>
- c = '%s/bin/dsconfig%s' % (SEC_I2_ROOT, fileExt)
+ c = '%s/%s/dsconfig%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
p.append('create-backend --bindDN "%s"' % DM_DN)
p.append('--bindPassword "%s" --port %s' % (DM_PW, SEC_I2_PORT))
@@ -472,7 +472,7 @@
<!-- 3.3. Import data I1 -->
<message>'++ Import data on I1'</message>
<script>
- c = '%s/bin/import-ldif%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/import-ldif%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--bindDN "%s" --bindPassword "%s"' % (DM_DN, DM_PW))
p.append('--port %s --backendID o1' % SEC_I1_PORT)
@@ -495,7 +495,7 @@
<!-- 3.4. Enable replication I1-I2 -->
<message>'++ Enable replication I1-I2'</message>
<script>
- c = '%s/bin/dsreplication%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/dsreplication%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('enable --host1 %s' % STAF_REMOTE_HOSTNAME)
p.append('--bindDN1 "%s"' % DM_DN)
@@ -526,7 +526,7 @@
<!-- 3.5. Initialize replication -->
<message>'++ Initialize replication I1-I2'</message>
<script>
- c = '%s/bin/dsreplication%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/dsreplication%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('initialize -I admin -w secret12 --baseDN "o=o1"')
p.append('--hostSource %s' % STAF_REMOTE_HOSTNAME)
@@ -552,7 +552,7 @@
<!-- 4.1. Check SSL I1 -->
<message>'++ Check SSL I1'</message>
<script>
- c = '%s/bin/ldapsearch%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/ldapsearch%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--hostname %s' % STAF_REMOTE_HOSTNAME)
p.append('--port %s' % SEC_I1_SPORT)
@@ -589,7 +589,7 @@
<!-- 4.2. Check SSL I2 -->
<message>'++ Check SSL I2'</message>
<script>
- c = '%s/bin/ldapsearch%s' % (SEC_I2_ROOT, fileExt)
+ c = '%s/%s/ldapsearch%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
p.append('--hostname %s' % STAF_REMOTE_HOSTNAME)
p.append('--port %s' % SEC_I2_SPORT)
@@ -626,7 +626,7 @@
<!-- 4.3. Check not-StartTLS I1 -->
<message>'++ Check not-StartTLS I1'</message>
<script>
- c = '%s/bin/ldapsearch%s' % (SEC_I1_ROOT, fileExt)
+ c = '%s/%s/ldapsearch%s' % (SEC_I1_ROOT, fileFolder, fileExt)
p = []
p.append('--hostname %s' % STAF_REMOTE_HOSTNAME)
p.append('--port %s' % SEC_I1_PORT)
@@ -651,7 +651,7 @@
<!-- 4.4. Check StartTLS I2 -->
<message>'++ Check StartTLS OK on I2'</message>
<script>
- c = '%s/bin/ldapsearch%s' % (SEC_I2_ROOT, fileExt)
+ c = '%s/%s/ldapsearch%s' % (SEC_I2_ROOT, fileFolder, fileExt)
p = []
p.append('--hostname %s' % STAF_REMOTE_HOSTNAME)
p.append('--port %s' % SEC_I2_PORT)
diff --git a/opends/tests/functional-tests/testcases/setup/setup.xml b/opends/tests/functional-tests/testcases/setup/setup.xml
index 244a2ad..69c80ba 100644
--- a/opends/tests/functional-tests/testcases/setup/setup.xml
+++ b/opends/tests/functional-tests/testcases/setup/setup.xml
@@ -42,7 +42,7 @@
-->
<script>
CurrentTestPath['group'] = 'setup'
- OUT_GROUP = '%s/setup' % logsTempDir
+ OUT_GROUP = '%s/setup' % DIRECTORY_INSTANCE_DIR
ODS_UNZIPPED = '%s/unzipped' % OUT_GROUP
</script>
--
Gitblit v1.10.0