From 7ccc3480979b87a09869eb0f8f9bc10c052e6e3f 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)
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml | 15
opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml | 63 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml | 2
opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml | 2
opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml | 27
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml | 2
opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml | 12
opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 216 +-----------
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml | 16
opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml | 23
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml | 4
opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml | 40 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml | 4
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml | 10
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml | 23
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml | 3
opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml | 26 +
opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml | 72 ++-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml | 56 +--
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml | 58 +--
opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml | 48 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml | 55 +-
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml | 16
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml | 6
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml | 15
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml | 3
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml | 18 +
60 files changed, 408 insertions(+), 509 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml
index 17041f2..bc92b66 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/aci/aci_setup.xml
@@ -84,7 +84,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml
index 9be3f0a..877754a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/backend_setup.xml
@@ -119,7 +119,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
index 73d575b..01e9179 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/export.xml
@@ -134,7 +134,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -197,7 +197,7 @@
<call function="'importLdif'">
{ 'ldifFile' : '%s/backends/Export_schema.ldif' % remote.data,
'backEnd' : 'schema',
- 'dsPath' : '%s/server2/%s' % (DIRECTORY_INSTANCE_DIR, OPENDSNAME),
+ 'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'knownIssue' : '2173'
}
</call>
@@ -258,7 +258,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -339,7 +339,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -422,7 +422,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -505,7 +505,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -586,7 +586,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort}
@@ -667,7 +667,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -748,7 +748,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -832,7 +832,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -914,7 +914,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -998,7 +998,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1082,7 +1082,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1165,7 +1165,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1248,7 +1248,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1332,7 +1332,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1414,7 +1414,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort}
@@ -1494,7 +1494,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1576,7 +1576,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1659,7 +1659,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1742,7 +1742,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1825,7 +1825,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1904,7 +1904,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
@@ -1991,7 +1991,7 @@
<!-- Wait for DS to start -->
<call function="'isAlive'">
{ 'location' : mylocation,
- 'noOfLoops' : 1 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000,
'dsPath' : '%s/%s' % (DsInstanceDir, OPENDSNAME),
'dsInstancePort' : DsInstancePort
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
index 4766ddc..88b49be 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
@@ -1134,7 +1134,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
- 'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
+ 'dsRejectFile' : '%s/rejects.txt' % remote.temp,
'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1177,7 +1177,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
- 'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
+ 'dsRejectFile' : '%s/rejects.txt' % remote.temp,
'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
index 2ba0ff7..69ac59a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore.xml
@@ -130,7 +130,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -196,7 +196,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index 3442726..d55951c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -194,7 +194,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -500,18 +500,19 @@
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
'expectedRC' : 'noCheck' ,
- 'outputFile' : 'ldapsearch_simplepagesize_30.out'
+ 'outputFile' : 'ldapsearch_simplepagesize_30.out' ,
+ 'outputPath' : remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/ldapsearch_simplepagesize_30.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ % remote.temp ,
'targetLdif' : '%s/clu/ldapsearch_simplepagesize_30.ref' \
% remote.data ,
'outputLdif' : '%s/ldapsearch_simplepagesize_30.diff' \
- % DIRECTORY_INSTANCE_DIR
+ % remote.temp
}
</call>
@@ -537,18 +538,19 @@
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
'expectedRC' : 'noCheck' ,
- 'outputFile' : 'ldapsearch_simplepagesize_1.out'
+ 'outputFile' : 'ldapsearch_simplepagesize_1.out' ,
+ 'outputPath' : remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/ldapsearch_simplepagesize_1.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ % remote.temp ,
'targetLdif' : '%s/clu/ldapsearch_simplepagesize_1.ref' \
% remote.data ,
'outputLdif' : '%s/ldapsearch_simplepagesize_1.diff' \
- % DIRECTORY_INSTANCE_DIR
+ % remote.temp
}
</call>
@@ -603,7 +605,8 @@
'dsBaseDN' : basedn ,
'dsFilename' : filterfile ,
'dsAttributes' : 'dn' ,
- 'outputFile' : 'ldapsearch_filterfile_and_attribute.out'
+ 'outputFile' : 'ldapsearch_filterfile_and_attribute.out' ,
+ 'outputPath' : remote.temp
}
</call>
@@ -622,11 +625,11 @@
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/ldapsearch_filterfile_and_attribute.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ % remote.temp ,
'targetLdif' : '%s/clu/ldapsearch_filterfile_and_attribute.ref'\
% remote.data ,
'outputLdif' : '%s/ldapsearch_filterfile_and_attribute.diff' \
- % DIRECTORY_INSTANCE_DIR
+ % remote.temp
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
index 0bc1d34..5eb3ced 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldif-diff_checkbehavior.xml
@@ -86,8 +86,7 @@
{
'sourceLdif' : sourceldif ,
'targetLdif' : sourceldif ,
- 'outputLdif' : '%s/ldif-diff_nodiffs.out' \
- % DIRECTORY_INSTANCE_DIR
+ 'outputLdif' : '%s/ldif-diff_nodiffs.out' % remote.temp
}
</call>
@@ -124,8 +123,7 @@
{
'sourceLdif' : sourceldif ,
'targetLdif' : targetldif ,
- 'outputLdif' : '%s/ldif-diff_withdiffs.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'outputLdif' : '%s/ldif-diff_withdiffs.out' % remote.temp ,
'expectedRC' : 1 ,
'knownIssue' : '2641'
}
@@ -163,15 +161,15 @@
{
'sourceLdif' : sourceldif ,
'targetLdif' : targetldif ,
- 'outputLdif' : '%s/ldif-diff.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'outputLdif' : '%s/ldif-diff.out' % remote.temp ,
'expectedRC' : 'noCheck'
}
</call>
<call function="'compareFile'">
- {
+ {
'outputFile' : 'ldif-diff.out' ,
+ 'outputPath' : remote.temp ,
'refFile' : 'ldif-diff.ref',
'knownIssue' : '3111'
}
@@ -211,7 +209,7 @@
'sourceLdif' : sourceldif ,
'targetLdif' : targetldif ,
'outputLdif' : '%s/ldif-diff_singlevalue.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ % remote.temp ,
'singleValueChanges' : 'True' ,
'expectedRC' : 'noCheck'
}
@@ -220,6 +218,7 @@
<call function="'compareFile'">
{
'outputFile' : 'ldif-diff_singlevalue.out' ,
+ 'outputPath' : remote.temp ,
'refFile' : 'ldif-diff_singlevalue.ref' ,
'knownIssue' : '3111'
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
index 54bb917..f46315a 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifmodify_checkbehavior.xml
@@ -87,15 +87,15 @@
'sourceLdif' : sourceldif ,
'changesLdif' : '%s/clu/ldifmodify_checkbehavior.ldif' \
% remote.data ,
- 'targetLdif' : '%s/ldifmodify.out' % DIRECTORY_INSTANCE_DIR
+ 'targetLdif' : '%s/ldifmodify.out' % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/ldifmodify.out' % DIRECTORY_INSTANCE_DIR ,
+ 'sourceLdif' : '%s/ldifmodify.out' % remote.temp ,
'targetLdif' : '%s/clu/ldifmodify.ref' % remote.data ,
- 'outputLdif' : '%s/ldifmodify.diff' % DIRECTORY_INSTANCE_DIR
+ 'outputLdif' : '%s/ldifmodify.diff' % remote.temp
}
</call>
@@ -136,10 +136,8 @@
<call function="'LdifModifyWithScript'">
{
'sourceLdif' : sourceldif ,
- 'changesLdif' : '%s/clu/ldifmodify_moddn.ldif' \
- % remote.data ,
- 'targetLdif' : '%s/ldifmodify_moddn.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'changesLdif' : '%s/clu/ldifmodify_moddn.ldif' % remote.data ,
+ 'targetLdif' : '%s/ldifmodify_moddn.out' % remote.temp ,
'expectedRC' : 1
}
</call>
@@ -194,8 +192,7 @@
'sourceLdif' : sourceldif ,
'changesLdif' : '%s/clu/ldifmodify_concurrente.ldif' \
% remote.data ,
- 'targetLdif' : '%s/ldifmodify_concurrente.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'targetLdif' : '%s/ldifmodify_concurrente.out' % remote.temp ,
'expectedRC' : 1
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
index 2d1cc84..928aa1b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldifsearch_checkbehavior.xml
@@ -93,7 +93,7 @@
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
'outputFile' : 'ldapsearch.out' ,
- 'outputPath' : DIRECTORY_INSTANCE_DIR
+ 'outputPath' : remote.temp
}
</call>
@@ -102,15 +102,15 @@
'dsLdifFile' : dsfilename ,
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
- 'dsOutputFile' : '%s/ldifsearch.out' % DIRECTORY_INSTANCE_DIR
+ 'dsOutputFile' : '%s/ldifsearch.out' % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/ldifsearch.out' % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/ldapsearch.out' % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/ldifsearch.diff' % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/ldifsearch.out' % remote.temp ,
+ 'targetLdif' : '%s/ldapsearch.out' % remote.temp ,
+ 'outputLdif' : '%s/ldifsearch.diff' % remote.temp
}
</call>
@@ -161,7 +161,7 @@
'dsBaseDN' : 'dc=com' ,
'dsFilter' : 'objectclass=*' ,
'outputFile' : 'scope_ldapsearch.out' ,
- 'outputPath' : DIRECTORY_INSTANCE_DIR
+ 'outputPath' : remote.temp
}
</call>
@@ -171,19 +171,15 @@
'dsSearchScope' : 'base' ,
'dsBaseDN' : 'dc=com' ,
'dsFilter' : 'objectclass=*' ,
- 'dsOutputFile' : '%s/scope_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR
+ 'dsOutputFile' : '%s/scope_ldifsearch.out' % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/scope_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/scope_ldapsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/scope_ldifsearch.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/scope_ldifsearch.out' % remote.temp ,
+ 'targetLdif' : '%s/scope_ldapsearch.out' % remote.temp ,
+ 'outputLdif' : '%s/scope_ldifsearch.diff' % remote.temp
}
</call>
@@ -288,17 +284,17 @@
'dsFilterFile' : filterfile ,
'dsAttributes' : 'dn' ,
'dsOutputFile' : '%s/ldifsearch_filterfile_and_attribute.out' \
- % DIRECTORY_INSTANCE_DIR
+ % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
'sourceLdif' : '%s/ldifsearch_filterfile_and_attribute.out' \
- % DIRECTORY_INSTANCE_DIR ,
+ % remote.temp ,
'targetLdif' : '%s/clu/ldapsearch_filterfile_and_attribute.ref'\
% remote.data ,
- 'outputLdif' : '%s/ldifmodify.diff' % DIRECTORY_INSTANCE_DIR
+ 'outputLdif' : '%s/ldifmodify.diff' % remote.temp
}
</call>
@@ -405,7 +401,7 @@
'dsFilter' : 'uid=user.1*' ,
'dsAttributes' : '@person' ,
'outputFile' : 'ocname1_ldapsearch.out' ,
- 'outputPath' : DIRECTORY_INSTANCE_DIR
+ 'outputPath' : remote.temp
}
</call>
@@ -415,19 +411,15 @@
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
'dsAttributes' : '@person' ,
- 'dsOutputFile' : '%s/ocname1_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR
+ 'dsOutputFile' : '%s/ocname1_ldifsearch.out' % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/ocname1_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/ocname1_ldapsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/ocname1_ldifsearch.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/ocname1_ldifsearch.out' % remote.temp ,
+ 'targetLdif' : '%s/ocname1_ldapsearch.out' % remote.temp ,
+ 'outputLdif' : '%s/ocname1_ldifsearch.diff' % remote.temp
}
</call>
@@ -452,7 +444,7 @@
'dsFilter' : 'uid=user.1*' ,
'dsAttributes' : '@inetorgperson' ,
'outputFile' : 'ocname2_ldapsearch.out' ,
- 'outputPath' : DIRECTORY_INSTANCE_DIR
+ 'outputPath' : remote.temp
}
</call>
@@ -462,19 +454,15 @@
'dsBaseDN' : basedn ,
'dsFilter' : 'uid=user.1*' ,
'dsAttributes' : '@inetorgperson' ,
- 'dsOutputFile' : '%s/ocname2_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR
+ 'dsOutputFile' : '%s/ocname2_ldifsearch.out' % remote.temp
}
</call>
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/ocname2_ldifsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/ocname2_ldapsearch.out' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/ocname2_ldifsearch.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/ocname2_ldifsearch.out' % remote.temp ,
+ 'targetLdif' : '%s/ocname2_ldapsearch.out' % remote.temp ,
+ 'outputLdif' : '%s/ocname2_ldifsearch.diff' % remote.temp
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
index 16bd5b5..0dbb058 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
@@ -83,8 +83,7 @@
<call function="'MakeLdifWithScript'">
{
'templateFile' : template ,
- 'ldifFile' : '%s/make-ldif_seed0_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'ldifFile' : '%s/make-ldif_seed0_1.ldif' % remote.temp ,
'randomSeed' : 0
}
</call>
@@ -137,8 +136,7 @@
<call function="'MakeLdifWithScript'">
{
'templateFile' : template ,
- 'ldifFile' : '%s/make-ldif_seed0_2.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'ldifFile' : '%s/make-ldif_seed0_2.ldif' % remote.temp ,
'randomSeed' : 0
}
</call>
@@ -157,8 +155,7 @@
<call function="'ImportLdifWithScript'">
{
- 'dsLdifFile' : '%s/make-ldif_seed0_2.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'dsLdifFile' : '%s/make-ldif_seed0_2.ldif' % remote.temp ,
'dsBackEnd' : DIRECTORY_INSTANCE_BE ,
'dsAppend' : 'True'
}
@@ -182,7 +179,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -256,8 +253,7 @@
<call function="'MakeLdifWithScript'">
{
'templateFile' : template ,
- 'ldifFile' : '%s/make-ldif_noseed_1.ldif' \
- % DIRECTORY_INSTANCE_DIR
+ 'ldifFile' : '%s/make-ldif_noseed_1.ldif' % remote.temp
}
</call>
@@ -268,8 +264,7 @@
<call function="'MakeLdifWithScript'">
{
'templateFile' : template ,
- 'ldifFile' : '%s/make-ldif_noseed_2.ldif' \
- % DIRECTORY_INSTANCE_DIR
+ 'ldifFile' : '%s/make-ldif_noseed_2.ldif' % remote.temp
}
</call>
@@ -280,8 +275,7 @@
<call function="'MakeLdifWithScript'">
{
'templateFile' : template ,
- 'ldifFile' : '%s/make-ldif_seed5.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
+ 'ldifFile' : '%s/make-ldif_seed5.ldif' % remote.temp ,
'randomSeed' : 5
}
</call>
@@ -292,12 +286,9 @@
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/make-ldif_seed0_2.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/make-ldif_seed0.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' % remote.temp ,
+ 'targetLdif' : '%s/make-ldif_seed0_2.ldif' % remote.temp ,
+ 'outputLdif' : '%s/make-ldif_seed0.diff' % remote.temp
}
</call>
@@ -308,12 +299,9 @@
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/make-ldif_noseed_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/make-ldif_noseed_1.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' % remote.temp ,
+ 'targetLdif' : '%s/make-ldif_noseed_1.ldif' % remote.temp ,
+ 'outputLdif' : '%s/make-ldif_noseed_1.diff' % remote.temp
}
</call>
@@ -323,12 +311,9 @@
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/make-ldif_noseed_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/make-ldif_noseed_2.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/make-ldif_noseed_2.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/make-ldif_noseed_1.ldif' % remote.temp ,
+ 'targetLdif' : '%s/make-ldif_noseed_2.ldif' % remote.temp ,
+ 'outputLdif' : '%s/make-ldif_noseed_2.diff' % remote.temp
}
</call>
@@ -339,12 +324,9 @@
<call function="'LdifDiffWithScript'">
{
- 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'targetLdif' : '%s/make-ldif_seed5.ldif' \
- % DIRECTORY_INSTANCE_DIR ,
- 'outputLdif' : '%s/make-ldif_seed5.diff' \
- % DIRECTORY_INSTANCE_DIR
+ 'sourceLdif' : '%s/make-ldif_seed0_1.ldif' % remote.temp ,
+ 'targetLdif' : '%s/make-ldif_seed5.ldif' % remote.temp ,
+ 'outputLdif' : '%s/make-ldif_seed5.diff' % remote.temp
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
index e28d782..ed4f284 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
@@ -555,7 +555,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml
index 1424cc7..48c1d11 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/clu/clu_setup.xml
@@ -163,7 +163,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
index 856871b..b247df4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/core/core_setup.xml
@@ -79,7 +79,7 @@
</call>
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index 531bba8..79b0a1d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -90,7 +90,7 @@
'subcommand' : '%s' % componentList[componentNumber][0] ,
'objectType' : '%s' % componentList[componentNumber][1] ,
'objectName' : '%s' % componentList[componentNumber][2] ,
- 'optionsString' : '--backend-name %s' DIRECTORY_INSTANCE_BE ,
+ 'optionsString' : '--backend-name %s' % DIRECTORY_INSTANCE_BE ,
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
index 4c6892d..0f74faa 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_setup.xml
@@ -84,7 +84,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index e14419a..c7cdcd7 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -115,7 +115,7 @@
</call>
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
index 56a336b..bae3b6c 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_test.xml
@@ -144,7 +144,7 @@
<call function="'testCase_Preamble'"/>
<script>
runFileName = runFileRE.sub('run',test)
- runFilePath = '/tmp/%s_%s' % (family, runFileName)
+ runFilePath = '%s/%s_%s' % (local.temp, family, runFileName)
requestFilePath = '%s/dsml/suites/%s/data/%s' % \
(local.data,family,test)
expectedFileName = runFileRE.sub('res',test)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
index 69dd80c..fb2d498 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/groups/group_setup.xml
@@ -106,7 +106,7 @@
</call>
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
index 041de3f..703d35b 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_8bit_dataComparison.xml
@@ -99,7 +99,7 @@
'dsEncoding' : '8859-1' ,
'expectedRC' : 'noCheck' ,
'outputFile' : 'ldapsearch.out' ,
- 'outputPath' : TMPDIR
+ 'outputPath' : remote.temp
}
</call>
@@ -110,8 +110,8 @@
<call function="'LdifDiffWithScript-new'">
{
'sourceLdif' : RefFile ,
- 'targetLdif' : '%s/ldapsearch.out' % TMPDIR ,
- 'outputLdif' : '%s/ldifsearch.diff' % TMPDIR
+ 'targetLdif' : '%s/ldapsearch.out' % remote.temp ,
+ 'outputLdif' : '%s/ldifsearch.diff' % remote.temp
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
index 27308ad..b1082b1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/i18n/i18n_setup.xml
@@ -83,7 +83,7 @@
</call>
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index 9463d8c..646990c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -178,6 +178,13 @@
'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
}
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
<call function="'loopThroughFilters'">
{ 'filters' : 'after-modify' }
</call>
@@ -349,6 +356,13 @@
'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
}
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
<call function="'loopThroughFilters'">
{ 'filters' : 'after-add' }
</call>
@@ -774,7 +788,7 @@
{ 'functionName' : 'isAlive',
'functionMessage' : 'Checking if the server is available',
'functionException' : 'Topology.StartException',
- 'functionArguments' : { 'noOfLoops' : 5,
+ 'functionArguments' : { 'noOfLoops' : 10,
'noOfMilliSeconds' : 2000
}
}
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml
index c517977..4b9839f 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_setup.xml
@@ -71,7 +71,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
index d1312e4..db067ad 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/logging/logging_writer.xml
@@ -248,13 +248,25 @@
}
</call>
- <call function="'RestartDs'">
- { 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsBindDN' : DIRECTORY_INSTANCE_DN,
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<message>'--- Check log files ---'</message>
<call function="'listFolder'">
{ 'location' : '%s' % DIRECTORY_INSTANCE_HOST,
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml
index 9552148..55f54b5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_setup.xml
@@ -67,7 +67,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
index e672835..c0f7f29 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_refint.xml
@@ -614,13 +614,15 @@
'dsHost' : DIRECTORY_INSTANCE_HOST,
'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD,
- 'dsRestart' : ' ' }
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
</call>
-
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml
index 05df6c9..eaafe49 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/plugins/plugins_setup.xml
@@ -67,7 +67,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
index 4d02021..d613e14 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_directory_manager.xml
@@ -1788,7 +1788,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
index 7385e12..13cc04c 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_new_root_user.xml
@@ -1771,7 +1771,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml
index 97b9413..f3abf76 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_setup.xml
@@ -84,7 +84,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
index 1910b0b..379353e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_users.xml
@@ -3015,7 +3015,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
index fd09a3f..a438baa 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -41,7 +41,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
index d3caacc..a59d67e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/sample/sample.xml
@@ -294,7 +294,7 @@
{ 'functionName' : 'isAlive' ,
'functionMessage' : 'Checking if the server is available' ,
'functionException' : 'Topology.StartException' ,
- 'functionArguments' : { 'noOfLoops' : 5 ,
+ 'functionArguments' : { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
index d73eafa..ed0cc7d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/schema/schema_setup.xml
@@ -61,7 +61,7 @@
{ 'functionName' : 'isAlive' ,
'functionMessage' : 'Start the Directory Server.' ,
'functionException' : 'Server.StartException' ,
- 'functionArguments' : { 'noOfLoops' : 5 ,
+ 'functionArguments' : { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
index 6bbdeb5..a9d995a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/client_auth_teardown.xml
@@ -94,7 +94,8 @@
<call function="'deleteFile'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
+ 'filename' : '%s/%s/config/keystore' \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'checktestRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
index 934f230..00853e6 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_custom_jks.xml
@@ -92,7 +92,8 @@
<call function="'deleteFile'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
+ 'filename' : '%s/%s/config/keystore' \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
index 258259f..9f17fc5 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/jks/security_teardown_jks.xml
@@ -87,7 +87,8 @@
<call function="'deleteFile'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
+ 'filename' : '%s/%s/config/keystore' \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
index 8ca46a2..4c7b838 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/pkcs12/security_teardown_pkcs12.xml
@@ -94,7 +94,8 @@
<call function="'deleteFile'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
+ 'filename' : '%s/%s/config/keystore' \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
index ad17e2e..957b74a 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/security_setup.xml
@@ -80,7 +80,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
index 439ba26..f828304 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/security/startTLS/security_teardown_startTLS.xml
@@ -69,7 +69,8 @@
<call function="'deleteFile'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'filename' : '%s/../config/keystore' % OPENDS_BINPATH }
+ 'filename' : '%s/%s/config/keystore' \
+ % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'checkRC'">
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
index a391429..69173d4 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
@@ -848,7 +848,7 @@
newDn = 'uid=user.%s' % newid
templateFile = 'template-%s.ldif' % loop
- templatePath = '%s/%s' % (TMPDIR, templateFile)
+ templatePath = '%s/%s' % (remote.temp, templateFile)
ldifFile = 'moddn-%s.ldif' % loop
ldifPath = '%s/%s' % (DIRECTORY_INSTANCE_DIR, ldifFile)
ldifLines = []
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
index e66bf93..f907a89 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_registermbean.xml
@@ -116,7 +116,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
index cb49ee1..81bb1e2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_setup.xml
@@ -169,7 +169,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
index e772e9c..1cf70cb 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
@@ -56,6 +56,8 @@
community = '%s@%s' \
% (SNMP_PROPERTIES['community'], SNMP_PROPERTIES['community'])
oid = 'dsServerType.1'
+ serverLogFile = '%s/%s/logs/server.out' \
+ % (DIRECTORY_INSTANCE_DIR, OPENDSNAME)
</script>
<!--- Test Case information
@@ -131,7 +133,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -377,15 +379,10 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
-
- <script>
- returnString = STAXResult[0][1]
- </script>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -400,10 +397,11 @@
msg = '%s %s %s %s %s %s' % (msg1, msg2, msg3, msg4, msg5, msg6)
</script>
- <call function="'checktestString'">
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
@@ -542,15 +540,10 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
-
- <script>
- returnString = STAXResult[0][1]
- </script>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -562,10 +555,11 @@
msg = '%s %s %s' % (msg1, msg2, msg3)
</script>
- <call function="'checktestString'">
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
@@ -578,10 +572,13 @@
msg6 = 'The SNMP connection Handler didn\'t started'
msg = '%s %s %s %s %s %s' % (msg1, msg2, msg3, msg4, msg5, msg6)
</script>
- <call function="'checktestStringNotPresent'">
+
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'testString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString' : msg ,
+ 'expectedRC' : 1
}
</call>
@@ -730,15 +727,10 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
-
- <script>
- returnString = STAXResult[0][1]
- </script>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -750,10 +742,11 @@
msg = '%s %s %s' % (msg1, msg2, msg3)
</script>
- <call function="'checktestString'">
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
index 5b68831..85bdf1e 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_customconf.xml
@@ -59,6 +59,8 @@
wrongTrapsDestProp = 'wrongtrapdestination'
outputFile2 = '%s/timer.out' % DIRECTORY_INSTANCE_DIR
timerDuration2 = '5m'
+ serverLogFile = '%s/%s/logs/server.out' \
+ % (DIRECTORY_INSTANCE_DIR, OPENDSNAME)
</script>
<!--- Test Case information
@@ -150,9 +152,16 @@
'trap_defaultconf: restart the server'
</message>
<call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsRestart' : 'True'
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
}
</call>
@@ -227,9 +236,16 @@
'trap_defaultconf: restart the server'
</message>
<call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsRestart' : 'True'
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
}
</call>
@@ -386,9 +402,16 @@
'trap_defaultconf: restart the server'
</message>
<call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsRestart' : 'True'
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
}
</call>
@@ -552,18 +575,13 @@
'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
}
</call>
-
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
- <script>
- returnString = STAXResult[0][1]
- </script>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -574,11 +592,12 @@
msg2 = 'Traps will not be sent to this destination'
msg = '%s %s' % (msg1, msg2)
</script>
-
- <call function="'checktestString'">
+
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
@@ -588,10 +607,11 @@
msg = '%s %s' % (msg1, msg2)
</script>
- <call function="'checktestString'">
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
@@ -769,15 +789,10 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
-
- <script>
- returnString = STAXResult[0][1]
- </script>
-
<!--- Check that DS started -->
<call function="'isAlive'">
{
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000
}
</call>
@@ -789,10 +804,11 @@
msg = '%s %s' % (msg1, msg2)
</script>
- <call function="'checktestString'">
+ <call function="'grep'">
{
- 'returnString' : returnString ,
- 'expectedString' : msg
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'filename' : serverLogFile ,
+ 'testString': msg
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
index 80b22c0..c3a2ce1 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_trap_defaultconf.xml
@@ -228,6 +228,13 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
<message>
'trap_defaultconf: send event to the trap listener'
@@ -327,9 +334,16 @@
'trap_defaultconf: restart the server'
</message>
<call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
{
- 'location' : STAF_REMOTE_HOSTNAME ,
- 'dsRestart' : 'True'
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
index 609de24..e64bc6f 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/restart_db.xml
@@ -73,20 +73,11 @@
'dsStopTime' : '20061212000000' }
</call>
- <call function="'Sleep'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'sleepForMilliSeconds' : 10000 }
- </call>
-
- <call function="'SearchObject'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : DIRECTORY_INSTANCE_SFX,
- 'dsFilter' : 'objectclass=*' ,
- 'dsScope' : 'base',
- 'expectedRC' : 0 }
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
</call>
<call function="'testCase_Postamble'"/>
@@ -134,6 +125,14 @@
<call function="'StartDsWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME }
</call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
index e4d005f..1a480e4 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/tasks/setup.xml
@@ -78,7 +78,7 @@
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
index 710d220..b43a719 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
@@ -86,7 +86,7 @@
</call>
<!--- Check that DS started -->
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
index bdf1d7b..8fd2ac1 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/baselib.xml
@@ -37,7 +37,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index 6fb138c..b23d854 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -67,7 +67,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>
@@ -216,7 +216,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -330,7 +330,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>
@@ -561,160 +561,6 @@
</sequence>
</function>
-
- <!-- This function restart DS using the stop-ds script -->
- <function name="RestartDs">
- <function-prolog>
- This function restarts a Directory Server
- </function-prolog>
- <function-map-args>
- <function-arg-def name="location"
- type="optional"
- default="STAF_REMOTE_HOSTNAME">
- <function-arg-description>
- Location of target host
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
- <function-arg-def name="dsPath"
- type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
- <function-arg-description>
- Pathname to installation root
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
-
- <function-arg-def name="dsHost"
- type="optional"
- default="'%s' % DIRECTORY_INSTANCE_HOST">
- <function-arg-description>
- Directory server hostname or IP address
- </function-arg-description>
- <function-arg-property name="type" value="hostname"/>
- </function-arg-def>
-
- <function-arg-def name="dsPort"
- type="optional"
- default="'%s' % DIRECTORY_INSTANCE_PORT">
- <function-arg-description>
- Directory server port number
- </function-arg-description>
- <function-arg-property name="type" value="port"/>
- </function-arg-def>
-
- <function-arg-def name="dsAdminPort"
- type="optional"
- default="'%s' % DIRECTORY_INSTANCE_ADMIN_PORT">
- <function-arg-description>
- Directory server admin port number
- </function-arg-description>
- <function-arg-property name="type" value="port"/>
- </function-arg-def>
-
- <function-arg-def name="dsBindDN"
- type="optional"
- default="'%s' % DIRECTORY_INSTANCE_DN">
- <function-arg-description>
- Bind DN
- </function-arg-description>
- <function-arg-property name="type" value="DN"/>
- </function-arg-def>
-
- <function-arg-def name="dsBindPwd"
- type="optional"
- default="'%s' % DIRECTORY_INSTANCE_PSWD">
- <function-arg-description>
- Bind password
- </function-arg-description>
- <function-arg-property name="type" value="string"/>
- </function-arg-def>
-
- <function-arg-def name="dsBindPwdFile" type="optional">
- <function-arg-description>
- Bind password file
- </function-arg-description>
- <function-arg-property name="type" value="integer"/>
- </function-arg-def>
- <function-arg-def name="extraParams" type="optional" default="''">
- <function-arg-description>
- Optional extra parameters for specific test cases
- </function-arg-description>
- <function-arg-property name="type" value="string"/>
- </function-arg-def>
- </function-map-args>
-
-
- <sequence>
-
- <!-- Build the Command -->
- <script>
- STAFCmdParamsList=[]
- STAFCmdParams=''
-
- if dsPath:
- dsBinPath='%s/%s' % (dsPath,fileFolder)
- STAFCmd='%s/stop-ds%s ' % (dsBinPath,fileExt)
-
- if dsHost:
- STAFCmdParamsList.append('-h %s' % dsHost)
-
- if dsAdminPort:
- STAFCmdParamsList.append('-p %s' % dsAdminPort)
- STAFCmdParamsList.append('-X')
-
- if dsBindDN:
- STAFCmdParamsList.append('-D "%s"' % dsBindDN)
-
- if dsBindPwd:
- STAFCmdParamsList.append('-w "%s"' % dsBindPwd)
-
- if dsBindPwdFile:
- STAFCmdParamsList.append('-j "%s"' % dsBindPwdFile)
-
- STAFCmdParamsList.append('-R')
-
- STAFCmdParams=' '.join(STAFCmdParamsList)
- </script>
-
- <message>
- '%s %s' % (STAFCmd, STAFCmdParams)
- </message>
-
- <message>'******************************'</message>
- <message>'*** Restarting the Server ***'</message>
- <message>'******************************'</message>
-
- <process name="'restart DS'">
- <location>'%s' % (location)</location>
- <command>'%s' % (STAFCmd)</command>
- <parms>'%s' % (STAFCmdParams)</parms>
- <workdir>'%s' % dsBinPath</workdir>
- <envs>
- ['PATH=/bin:/usr/bin:%s' % dsBinPath, 'JAVA_HOME=%s' % JAVA_HOME]
- </envs>
- <stderr mode="'stdout'"/>
- <returnstdout/>
- </process>
-
- <!-- Wait for DS to start -->
- <call function="'isAlive'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'dsInstanceHost' : dsHost ,
- 'dsInstancePort' : dsPort ,
- 'dsInstanceDn' : dsBindDN ,
- 'dsInstancePswd' : dsBindPwd ,
- 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 6000 }
- </call>
-
- <message>'*** Restarting the Server is completed ***'</message>
- <message>'***************************************'</message>
- </sequence>
- </function>
-
-
<!-- Import LDIF file Function -->
<function name="importLdif">
<function-prolog>
@@ -727,7 +573,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -803,7 +649,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>
@@ -1091,7 +937,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1385,7 +1231,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>
@@ -1515,7 +1361,7 @@
'dsInstancePort' : myport ,
'dsInstanceDn' : mydn ,
'dsInstancePswd' : mypswd ,
- 'noOfLoops' : 5 ,
+ 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
@@ -1595,7 +1441,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>
@@ -1729,7 +1575,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1981,7 +1827,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>
@@ -2112,7 +1958,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2331,7 +2177,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>
@@ -2453,7 +2299,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2623,7 +2469,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2754,7 +2600,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2872,7 +2718,7 @@
<if expr="STAFCmdRC == 0">
<sequence>
<call function="'isAlive'">
- { 'noOfLoops' : 5 ,
+ { 'noOfLoops' : 10 ,
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
@@ -2897,7 +2743,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3042,7 +2888,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3179,7 +3025,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3370,7 +3216,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3500,7 +3346,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3678,7 +3524,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>
@@ -3774,7 +3620,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -3916,7 +3762,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>
@@ -4120,7 +3966,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>
@@ -4377,7 +4223,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -4501,7 +4347,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>
@@ -4596,7 +4442,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>
@@ -4716,7 +4562,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>
@@ -4818,7 +4664,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>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
index 475e0ea..dac5784 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsconfig.xml
@@ -68,7 +68,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>
@@ -227,7 +227,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>
@@ -398,7 +398,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>
@@ -532,7 +532,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>
@@ -647,7 +647,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>
@@ -771,7 +771,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>
@@ -886,7 +886,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>
@@ -1001,7 +1001,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>
@@ -1117,7 +1117,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>
@@ -1231,7 +1231,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>
@@ -1354,7 +1354,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>
@@ -1492,7 +1492,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>
@@ -1598,7 +1598,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>
@@ -1713,7 +1713,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>
@@ -1809,7 +1809,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>
@@ -1942,7 +1942,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>
@@ -2076,7 +2076,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>
@@ -2214,7 +2214,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>
@@ -2341,7 +2341,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>
@@ -2423,7 +2423,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>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
index 8203c65..197e16e 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/environment.xml
@@ -221,7 +221,7 @@
<!-- Get Directory Server Variables -->
<call function="'GetDirectoryServerVars'">
{ 'location' : STAF_REMOTE_HOSTNAME,
- 'dsPath' : '%s' % InstanceInstallDir }
+ 'dsPath' : '%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME) }
</call>
<if expr="RC != 0">
@@ -401,11 +401,11 @@
</message>
<call function="'deleteFolder'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
- 'foldername' : DIRECTORY_INSTANCE_DIR }
+ 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'createFolder'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
- 'foldername' : DIRECTORY_INSTANCE_DIR }
+ 'foldername' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME) }
</call>
<call function="'GetDirectoryServerInformation'"/>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
index 82f00d1..6a1eb35 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/ldap.xml
@@ -37,7 +37,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -157,7 +157,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -515,7 +515,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -634,7 +634,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1120,17 +1120,32 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
- <call function="'runCommand'" >
- { 'name' : 'LDAP Search Script',
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : location,
- 'outputFile': '%s/%s' % (outputPath, outputFile) ,
- 'expectedRC': expectedRC ,
- 'logStderr' : logStderr,
- 'knownIssue': knownIssue
- }
- </call>
+ <if expr="outputFile != 'None'">
+ <call function="'runCommand'" >
+ { 'name' : 'LDAP Search Script',
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : location,
+ 'outputFile': '%s/%s' % (outputPath, outputFile) ,
+ 'expectedRC': expectedRC ,
+ 'logStderr' : logStderr,
+ 'knownIssue': knownIssue
+ }
+ </call>
+ <else>
+ <call function="'runCommand'" >
+ { 'name' : 'LDAP Search Script',
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : location,
+ 'expectedRC': expectedRC ,
+ 'logStderr' : logStderr,
+ 'knownIssue': knownIssue
+ }
+ </call>
+ </else>
+ </if>
+
<return>
STAXResult
</return>
@@ -1149,7 +1164,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1304,7 +1319,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1387,7 +1402,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1466,7 +1481,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1785,7 +1800,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1906,7 +1921,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2236,7 +2251,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2382,7 +2397,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2833,7 +2848,7 @@
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
index 2206f49..aafce6c 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
@@ -410,7 +410,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -607,7 +607,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -748,7 +748,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -918,7 +918,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1099,7 +1099,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -1219,7 +1219,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
index d36a97a..fad2232 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/snmp.xml
@@ -165,7 +165,7 @@
else:
separator=':'
- opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
+ opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE)
snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
@@ -333,7 +333,7 @@
else:
separator=':'
- opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
+ opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE)
snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
@@ -465,7 +465,7 @@
else:
separator=':'
- opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_DIR,SNMP_OPENDS_JARFILE)
+ opends_jarfile='%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE)
snmpPath='%s/snmp' % remote.java
jdmk_jarfile='%s/jdmkrt.jar' % snmpPath
cp = 'CLASSPATH=%s%s%s%s%s%s.' \
@@ -514,7 +514,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>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
index bc24285..4b3f5ba 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opendj-sdk/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>
+
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
index 0fa5e0b..4836da6 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/topology.xml
@@ -395,7 +395,19 @@
else:
jstaf_jarfile='%s/lib/JSTAF.jar' % STAFResult
</script>
-
+
+ <!--- In IPS mode, get snmp-mib2605.jar from remote machine-->
+ <if expr="DIRECTORY_INSTANCE_BIN != DIRECTORY_INSTANCE_DIR">
+ <call function="'copyFile'">
+ {
+ 'location' : STAF_REMOTE_HOSTNAME,
+ 'srcfile' : '%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE),
+ 'destfile' : '%s/%s' % (TMPDIR,SNMP_OPENDS_JARFILE),
+ 'remotehost' : STAXServiceMachine
+ }
+ </call>
+ </if>
+
<!--- Compile snmp java files on controler host -->
<message>
'Compile Java files under %s on %s' \
@@ -973,7 +985,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>
@@ -1232,7 +1244,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>
@@ -1384,7 +1396,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>
@@ -1751,7 +1763,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>
@@ -1906,7 +1918,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>
@@ -2047,7 +2059,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>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
index 69a926b..01c861d 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
@@ -465,7 +465,7 @@
</function-arg-description>
<function-arg-property name="type" value="hostname"/>
</function-arg-def>
- <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
+ <function-arg-def name="dsPath" type="optional" default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -2043,7 +2043,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>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
index 0f67792..3b1af17 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -41,6 +41,7 @@
TESTS_JAVA_DIR = '%s/shared/java' % TESTS_ROOT
DIRECTORY_INSTANCE_DN = '${opends.admin.dn}'
DIRECTORY_INSTANCE_PSWD = '${opends.admin.pwd}'
+DIRECTORY_INSTANCE_BIN = '%s' % TMPDIR'
DIRECTORY_INSTANCE_DIR = '%s' % TMPDIR
DIRECTORY_INSTANCE_HOST = 'localhost'
DIRECTORY_INSTANCE_PORT = '${opends.port.ldap}'
@@ -62,7 +63,7 @@
WC_PORT = '9000'
WC_SSL_PORT = '9001'
WC_HOST = 'localhost'
-DSML_WARNAME = 'OpenDS-1.1.0-DSML.war'
+DSML_WARNAME = 'opends-DSML.war'
DSML_WARPATH = '%s/build/package/%s' % (OPENDSDIR, DSML_WARNAME)
SNMP_OPENDS_JARFILE = '%s/lib/extensions/snmp-mib2605.jar' % OPENDSNAME
SNMP_OPENDMK_LIBDIR = '/path/to/opendmk/lib'
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
index b795eb9..f4e42eb 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -144,7 +144,7 @@
ServersInfoDict=eval(STAFResult)
- ServerPath='%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
+ ServerPath='%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)
ServerName='unknown'
ServerVersion='unknown'
ServerBuildId='unknown'
--
Gitblit v1.10.0