From cbf13ac79598fad694fcba848d48684093251c52 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 12 Feb 2009 10:56:36 +0000
Subject: [PATCH] Update the functional tests for package mode (split between install and instance)
---
opends/tests/staf-tests/shared/functions/tools.xml | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/tools.xml b/opends/tests/staf-tests/shared/functions/tools.xml
index bc24285..4b3f5ba 100755
--- a/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opends/tests/staf-tests/shared/functions/tools.xml
@@ -44,7 +44,7 @@
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -249,7 +249,7 @@
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -393,7 +393,7 @@
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -507,7 +507,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -653,7 +653,7 @@
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -852,7 +852,7 @@
'dsInstancePort' : server.getPort(),
'dsInstanceDn' : server.getRootDn(),
'dsInstancePswd' : server.getRootPwd(),
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -914,7 +914,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1090,7 +1090,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1243,7 +1243,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1371,7 +1371,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1459,7 +1459,7 @@
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1717,3 +1717,4 @@
</function>
</stax>
+
--
Gitblit v1.10.0