From 14e5dbbf5599ff7bc3c06627f9b321eaf6182a26 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 18 Mar 2008 13:08:17 +0000
Subject: [PATCH] add scope=local for functions declaration and fix related issues
---
opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml | 10 +-
opendj-sdk/opends/tests/system-tests/phases/log/topology.xml | 7 +
opendj-sdk/opends/tests/system-tests/phases/parser/parser.py | 1
opendj-sdk/opends/tests/system-tests/phases/verdict/verdict_opends.xml | 6
opendj-sdk/opends/tests/system-tests/phases/generateLdif/generateLdif.xml | 10 +-
opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml | 8 +-
opendj-sdk/opends/tests/system-tests/phases/shared/utils.xml | 16 ++--
opendj-sdk/opends/tests/system-tests/phases/verdict/verdict.xml | 19 ++--
opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml | 2
opendj-sdk/opends/tests/system-tests/phases/shared/ldap.xml | 11 +-
opendj-sdk/opends/tests/system-tests/phases/shared/stafcmd.xml | 14 +-
opendj-sdk/opends/tests/system-tests/phases/main_run.xml | 4
opendj-sdk/opends/tests/system-tests/phases/shared/signals.xml | 4
opendj-sdk/opends/tests/system-tests/phases/shared/staxcmd.xml | 2
opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml | 29 ++++++
opendj-sdk/opends/tests/system-tests/phases/scheduler/scheduler.xml | 10 +-
opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml | 2
opendj-sdk/opends/tests/system-tests/scenario/sample/sample.xml | 2
opendj-sdk/opends/tests/system-tests/phases/installation/installation.xml | 2
opendj-sdk/opends/tests/system-tests/phases/shared/dsadm.xml | 10 +-
opendj-sdk/opends/tests/system-tests/phases/configuration/configuration.xml | 2
opendj-sdk/opends/tests/system-tests/phases/configuration/configuration_opends.xml | 6
opendj-sdk/opends/tests/system-tests/phases/log/log.xml | 34 ++++----
23 files changed, 119 insertions(+), 92 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml b/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
index 6bcff62..d2cde23 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/modifyLoad/modifyLoad.xml
@@ -32,7 +32,7 @@
<!-- ************************************************************ -->
- <function name="modifyLoad">
+ <function name="modifyLoad" scope="local">
<function-map-args>
<function-arg-def name="client" type="required">
</function-arg-def>
diff --git a/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml b/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
index 534f831..41737d2 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/restartDs/restartDs.xml
@@ -32,7 +32,7 @@
<!-- ************************************************************ -->
- <function name="restartDs">
+ <function name="restartDs" scope="local">
<function-map-args>
<function-arg-def name="client" type="required">
</function-arg-def>
diff --git a/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml b/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
index 8e80389..f9b2094 100755
--- a/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
+++ b/opendj-sdk/opends/tests/system-tests/clients/searchLoad/searchLoad.xml
@@ -1,5 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE stax SYSTEM "../../../functional-tests/shared/stax.dtd">
+<!DOCTYPE stax SYSTEM "../../../shared/stax.dtd">
+<!--
+ ! CDDL HEADER START
+ !
+ ! The contents of this file are subject to the terms of the
+ ! Common Development and Distribution License, Version 1.0 only
+ ! (the "License"). You may not use this file except in compliance
+ ! with the License.
+ !
+ ! You can obtain a copy of the license at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
+ ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
+ ! See the License for the specific language governing permissions
+ ! and limitations under the License.
+ !
+ ! When distributing Covered Code, include this CDDL HEADER in each
+ ! file and include the License file at
+ ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
+ ! add the following below this CDDL HEADER, with the fields enclosed
+ ! by brackets "[]" replaced with your own identifying information:
+ ! Portions Copyright [yyyy] [name of copyright owner]
+ !
+ ! CDDL HEADER END
+ !
+ ! Copyright 2008 Sun Microsystems, Inc.
+ ! -->
<stax>
<defaultcall function="searchLoad"/>
@@ -7,7 +32,7 @@
<!-- ************************************************************ -->
- <function name="searchLoad">
+ <function name="searchLoad" scope="local">
<function-map-args>
<function-arg-def name="client" type="required">
</function-arg-def>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration.xml b/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration.xml
index 52f0ea3..588344d 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="configuration">
+ <function name="configuration" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
<function-arg-description>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration_opends.xml b/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration_opends.xml
index d6c7e20..d15808e 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration_opends.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/configuration/configuration_opends.xml
@@ -31,7 +31,7 @@
<!--==============================================================-->
<!--================= CONFIGURE OPENDS ==========================-->
<!--==============================================================-->
- <function name="configureOpends">
+ <function name="configureOpends" scope="local">
<function-map-args>
<function-arg-def name="topoInstances" type="required">
<function-arg-description>
@@ -270,7 +270,7 @@
<!-- Enable replication between servers using dsreplication -->
- <function name="enableReplication">
+ <function name="enableReplication" scope="local">
<function-prolog>
This function enables replication between servers using dsreplication.
</function-prolog>
@@ -499,7 +499,7 @@
<!-- Initialize replicated suffix with the contents -->
<!-- of a source server using dsreplication -->
- <function name="initializeReplication">
+ <function name="initializeReplication" scope="local">
<function-prolog>
This function initializes replicated suffixes with the contents
of a source server using dsreplication.
diff --git a/opendj-sdk/opends/tests/system-tests/phases/generateLdif/generateLdif.xml b/opendj-sdk/opends/tests/system-tests/phases/generateLdif/generateLdif.xml
index 4264359..a3d06ac 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/generateLdif/generateLdif.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/generateLdif/generateLdif.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="generateLdif">
+ <function name="generateLdif" scope="local">
<function-map-args>
<function-arg-def name="suffix" type="required">
<function-arg-description>
@@ -228,7 +228,7 @@
<!-- ************************************************************ -->
- <function name="generateTemplate">
+ <function name="generateTemplate" scope="local">
<function-map-args>
<function-arg-def name="templateFile" type="required">
<function-arg-description>
@@ -285,11 +285,11 @@
{ 'fileName' : templateFile }
</call>
<call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult,
+ { 'returncode' : STAXResult,
+ 'result' : 'template file does not exist',
'fileFd' : LOG_MAIN_FD }
</call>
- <call function="'writeEndTagOperation'">{'fileFd' : fileFd}</call>
+ <call function="'writeEndTagOperation'">{'fileFd' : LOG_MAIN_FD}</call>
</sequence>
</function>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/installation/installation.xml b/opendj-sdk/opends/tests/system-tests/phases/installation/installation.xml
index 48c3bf6..884b71b 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/installation/installation.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/installation/installation.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="installation">
+ <function name="installation" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
<function-arg-description>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml b/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
index 7c620d4..7cc8acb 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/installation/installation_opends.xml
@@ -31,7 +31,7 @@
<!--==============================================================-->
<!--================= INSTALL OPENDS ==========================-->
<!--==============================================================-->
- <function name="installOpends">
+ <function name="installOpends" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
<function-arg-description>
@@ -116,7 +116,7 @@
<!-- ************************************************************ -->
- <function name="cleanPreviousOpendsInstall">
+ <function name="cleanPreviousOpendsInstall" scope="local">
<function-map-args>
<function-arg-def name="host" type="required">
<function-arg-description>
@@ -198,7 +198,7 @@
<!-- ************************************************************ -->
- <function name="installSetupOpends">
+ <function name="installSetupOpends" scope="local">
<function-map-args>
<function-arg-def name="instance" type="required">
<function-arg-description>
@@ -279,7 +279,7 @@
<!-- ************************************************************ -->
- <function name="removeProcessIfNeeded">
+ <function name="removeProcessIfNeeded" scope="local">
<function-map-args>
<function-arg-def name="location" type="required">
</function-arg-def>
@@ -373,7 +373,7 @@
<!-- ************************************************************ -->
- <function name="updateMissingParameters">
+ <function name="updateMissingParameters" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
</function-arg-def>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/log/log.xml b/opendj-sdk/opends/tests/system-tests/phases/log/log.xml
index 1105498..a71adcb 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/log/log.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/log/log.xml
@@ -30,14 +30,14 @@
<defaultcall function="main_log"/>
<!-- ************************************************************ -->
- <function name="main_log">
+ <function name="main_log" scope="local">
<sequence>
<message log="1">'main_log() do nothing'</message>
</sequence>
</function>
<!-- ************************************************************ -->
- <function name="createLogDir">
+ <function name="createLogDir" scope="local">
<function-prolog>
'Create log directories for system test, using LOG_DIR variable'
</function-prolog>
@@ -72,7 +72,7 @@
<!-- ************************************************************ -->
- <function name="getLogFileName">
+ <function name="getLogFileName" scope="local">
<function-prolog>
'return a log file name'
</function-prolog>
@@ -109,7 +109,7 @@
<!-- ************************************************************ -->
- <function name="writeSummary">
+ <function name="writeSummary" scope="local">
<function-prolog>
''
</function-prolog>
@@ -163,7 +163,7 @@
<!-- ************************************************************ -->
- <function name="mergeClientsFiles">
+ <function name="mergeClientsFiles" scope="local">
<function-prolog>
''
</function-prolog>
@@ -236,7 +236,7 @@
<!-- ************************************************************ -->
- <function name="mergeFiles">
+ <function name="mergeFiles" scope="local">
<function-prolog>
''
</function-prolog>
@@ -313,7 +313,7 @@
<!-- ************************************************************ -->
- <function name="writeTag">
+ <function name="writeTag" scope="local">
<function-prolog>
''
</function-prolog>
@@ -363,7 +363,7 @@
<!-- ************************************************************ -->
- <function name="writeMessage">
+ <function name="writeMessage" scope="local">
<function-prolog>
write content in file
</function-prolog>
@@ -397,7 +397,7 @@
<!-- ************************************************************ -->
- <function name="writeOperationResult">
+ <function name="writeOperationResult" scope="local">
<function-prolog>
''
</function-prolog>
@@ -438,7 +438,7 @@
</function>
<!-- ************************************************************ -->
- <function name="writeStartTagStep">
+ <function name="writeStartTagStep" scope="local">
<function-prolog>
''
</function-prolog>
@@ -460,7 +460,7 @@
</sequence>
</function>
- <function name="writeEndTagStep">
+ <function name="writeEndTagStep" scope="local">
<function-prolog>
''
</function-prolog>
@@ -482,7 +482,7 @@
<!-- ************************************************************ -->
- <function name="writeStartTagOperation">
+ <function name="writeStartTagOperation" scope="local">
<function-prolog>
''
</function-prolog>
@@ -504,7 +504,7 @@
</sequence>
</function>
- <function name="writeEndTagOperation">
+ <function name="writeEndTagOperation" scope="local">
<function-prolog>
''
</function-prolog>
@@ -527,7 +527,7 @@
<!-- ************************************************************ -->
- <function name="writeStartTagPhase">
+ <function name="writeStartTagPhase" scope="local">
<function-prolog>
''
</function-prolog>
@@ -568,7 +568,7 @@
<!-- ************************************************************ -->
- <function name="writeEndTagPhase">
+ <function name="writeEndTagPhase" scope="local">
<function-prolog>
''
</function-prolog>
@@ -588,7 +588,7 @@
<!-- ************************************************************ -->
- <function name="writeStartTag">
+ <function name="writeStartTag" scope="local">
<function-prolog>
''
</function-prolog>
@@ -609,7 +609,7 @@
<!-- ************************************************************ -->
- <function name="writeEndTag">
+ <function name="writeEndTag" scope="local">
<function-prolog>
''
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml b/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
index 2167044..e2f4238 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/log/topology.xml
@@ -52,7 +52,7 @@
<!--========== Write node =========-->
<script>
- fileFd.write('<topology>\n')
+ LOG_MAIN_FD.write('<topology>\n')
</script>
<!-- Write instances informations -->
@@ -81,7 +81,7 @@
<!--========== close node =========-->
<script>
- fileFd.write('</topology>\n')
+ LOG_MAIN_FD.write('</topology>\n')
</script>
@@ -243,6 +243,9 @@
<sequence>
<!-- Write Suffix informations -->
<script>
+ sys.path.append("%s/phases/parser" % TESTS_DIR )
+ from parser import *
+
# SUFFIX TOPOLOGY
topoMsg = ''
topology = suffix.getTopology()
diff --git a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
index f48eac1..e7c2300 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
@@ -29,7 +29,7 @@
<defaultcall function="main_run"/>
- <function name="main_run">
+ <function name="main_run" scope="local">
<function-map-args>
<function-arg-def name="configurationFile" type="required">
<function-arg-description>
@@ -108,7 +108,7 @@
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/phases/shared/ldap.xml' % (TESTS_DIR)"/>
- <!-- TDB : should not have dependency with functional test suite -->
+ <!-- TBD : should not have dependency with functional test suite -->
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/../functional-run/staf/services/stax/libraries/STAXUtil.xml'
% (TESTS_DIR)"/>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml b/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
index f55a076..b120fc9 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/main_run_lib.xml
@@ -28,7 +28,7 @@
<stax>
<!-- ************************************************************ -->
- <function name="checkConfigurationFiles">
+ <function name="checkConfigurationFiles" scope="local">
<function-no-args/>
<sequence>
<if expr="OPENDSDIR == 'NEED_VALUE'">
@@ -78,7 +78,7 @@
<!-- ************************************************************ -->
- <function name="mainPreamble">
+ <function name="mainPreamble" scope="local">
<function-prolog>
'preamble before running the system test'
</function-prolog>
@@ -176,7 +176,7 @@
<!-- ************************************************************ -->
- <function name="mainPostamble">
+ <function name="mainPostamble" scope="local">
<function-prolog>
'postamble after running the system test'
</function-prolog>
@@ -329,7 +329,7 @@
<!-- ************************************************************ -->
- <function name="moveFolder">
+ <function name="moveFolder" scope="local">
<function-prolog>
'copy remote directory to STAXServiceMachine and delete it'
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py b/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
index b9ac5dc..4e1619f 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
+++ b/opendj-sdk/opends/tests/system-tests/phases/parser/parser.py
@@ -267,6 +267,7 @@
self.portJMX = portJMX
self.portREPL = portREPL
self.javaVersion = NOT_DEFINED
+ self.buildId = NOT_DEFINED
def getProduct(self):
return self.product
diff --git a/opendj-sdk/opends/tests/system-tests/phases/scheduler/scheduler.xml b/opendj-sdk/opends/tests/system-tests/phases/scheduler/scheduler.xml
index 867f54e..f99008f 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/scheduler/scheduler.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/scheduler/scheduler.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="scheduler">
+ <function name="scheduler" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
<function-arg-description>
@@ -119,7 +119,7 @@
<!-- ************************************************************ -->
- <function name="copyClients">
+ <function name="copyClients" scope="local">
<function-map-args>
<function-arg-def name="clients" type="required">
</function-arg-def>
@@ -196,7 +196,7 @@
<!-- ************************************************************ -->
- <function name="runClients">
+ <function name="runClients" scope="local">
<function-map-args>
<function-arg-def name="clients" type="required">
</function-arg-def>
@@ -360,7 +360,7 @@
<!-- ************************************************************ -->
- <function name="runClient">
+ <function name="runClient" scope="local">
<function-map-args>
<function-arg-def name="client" type="required">
</function-arg-def>
@@ -501,7 +501,7 @@
<!-- ************************************************************ -->
- <function name="sleepForDependency">
+ <function name="sleepForDependency" scope="local">
<function-map-args>
<function-arg-def name="location" type="optional"
default="'%s' % STAXServiceMachine">
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/dsadm.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/dsadm.xml
index eb2ba73..c3a1cad 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/dsadm.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/dsadm.xml
@@ -27,7 +27,7 @@
! -->
<stax>
- <function name="SetUpDsWithScript">
+ <function name="SetUpDsWithScript" scope="local">
<function-prolog>
This function sets up a Directory Server using a script
</function-prolog>
@@ -179,7 +179,7 @@
<!-- This function starts DS using the start-ds script -->
- <function name="StartDsWithScript">
+ <function name="StartDsWithScript" scope="local">
<function-prolog>
This function starts a Directory Server
</function-prolog>
@@ -308,7 +308,7 @@
</function>
<!-- This function stops DS using the stop-ds script -->
- <function name="StopDsWithScript">
+ <function name="StopDsWithScript" scope="local">
<function-prolog>
This function starts a Directory Server using the script
</function-prolog>
@@ -607,7 +607,7 @@
- <function name="makeLdif">
+ <function name="makeLdif" scope="local">
<function-prolog>
This function uses make-ldif to generate ldif file
</function-prolog>
@@ -691,7 +691,7 @@
<!-- Import Function With Script-->
- <function name="ImportLdifWithScript">
+ <function name="ImportLdifWithScript" scope="local">
<function-prolog>
This function performs an offline import of an ldif file using the script
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/ldap.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/ldap.xml
index 5bb0f0c..c85050f 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/ldap.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/ldap.xml
@@ -129,10 +129,9 @@
'fileFd' : fileFd
}
</call>
-
<script>
- ldapRC=RC
- ldapReason=STAXResult
+ ldapRC=STAXResult[0]
+ ldapReason=STAXResult[1]
</script>
<call function="'sleep'">
@@ -174,7 +173,7 @@
<!-- ************************************************************ -->
- <function name="verifyTrees">
+ <function name="verifyTrees" scope="local">
<function-prolog>
This function verifies that the tree of an instance belonging to an instances list
(ie instance[n]) is synchronized with instance[n+1]
@@ -284,7 +283,7 @@
'fileFd' : fileFd
}
</call>
- <if expr="RC != 0">
+ <if expr="STAXResult[0] != 0">
<!-- == If the reference tree could not be retrieved, return an error == -->
<sequence>
<call function="'writeEndTagStep'">{ 'fileFd' : fileFd}</call>
@@ -383,7 +382,7 @@
<!-- ************************************************************ -->
- <function name="ldapSearch">
+ <function name="ldapSearch" scope="local">
<function-prolog>
This function performs an ldapsearch
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/signals.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/signals.xml
index e2391df..0a8bb3c 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/signals.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/signals.xml
@@ -29,7 +29,7 @@
<defaultcall function="signals" />
- <function name="signals">
+ <function name="signals" scope="local">
<function-prolog>
This function contains all signal related functions
</function-prolog>
@@ -48,7 +48,7 @@
</function>
- <function name="OverideDefaultSignals">
+ <function name="OverideDefaultSignals" scope="local">
<function-prolog>
This function overides the default STAX signal handlers
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/stafcmd.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/stafcmd.xml
index 4c8e4fb..f0555f5 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/stafcmd.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/stafcmd.xml
@@ -26,7 +26,7 @@
! Copyright 2008 Sun Microsystems, Inc.
! -->
<stax>
- <function name="copyFile">
+ <function name="copyFile" scope="local">
<function-prolog>
This function copies a source file to destination file to host
</function-prolog>
@@ -118,7 +118,7 @@
</sequence>
</function>
- <function name="copyFolder">
+ <function name="copyFolder" scope="local">
<function-prolog>
This function copy directory through the network
</function-prolog>
@@ -202,7 +202,7 @@
</function>
- <function name="unZipFile">
+ <function name="unZipFile" scope="local">
<function-prolog>
This function unzips a compressed zip archive
</function-prolog>
@@ -266,7 +266,7 @@
- <function name="isFile">
+ <function name="isFile" scope="local">
<function-prolog>
This function returns TRUE if file exist, else FALSE
</function-prolog>
@@ -309,7 +309,7 @@
</sequence>
</function>
- <function name="isEmptyFile">
+ <function name="isEmptyFile" scope="local">
<function-prolog>
This function returns TRUE if file is empty, else FALSE
</function-prolog>
@@ -354,7 +354,7 @@
</function>
- <function name="deleteFolder">
+ <function name="deleteFolder" scope="local">
<function-prolog>
This function recursively deletes a folder
</function-prolog>
@@ -447,7 +447,7 @@
</function>
- <function name="createFolder">
+ <function name="createFolder" scope="local">
<function-prolog>
This function creates a folder
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/staxcmd.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/staxcmd.xml
index 0ef1441..aee4be8 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/staxcmd.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/staxcmd.xml
@@ -27,7 +27,7 @@
! -->
<stax>
- <function name="queryTestcase">
+ <function name="queryTestcase" scope="local">
<function-prolog>Queries the current testcase</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/shared/utils.xml b/opendj-sdk/opends/tests/system-tests/phases/shared/utils.xml
index 7481ea4..fa0d018 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/shared/utils.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/shared/utils.xml
@@ -28,7 +28,7 @@
<stax>
<!-- ************************************************************ -->
- <function name="checkRC">
+ <function name="checkRC" scope="local">
<function-prolog>
This function checks a return code against an expected return code
</function-prolog>
@@ -114,7 +114,7 @@
<!-- ************************************************************ -->
- <function name="phasePreamble">
+ <function name="phasePreamble" scope="local">
<function-prolog>
Performs all the preoperations for a phase
</function-prolog>
@@ -162,7 +162,7 @@
<!-- ************************************************************ -->
- <function name="phasePostamble">
+ <function name="phasePostamble" scope="local">
<function-prolog>
Performs all the post operations for a phase
</function-prolog>
@@ -214,7 +214,7 @@
<!-- ************************************************************ -->
- <function name="sleep">
+ <function name="sleep" scope="local">
<function-prolog>
Sleep for number of milliseconds
</function-prolog>
@@ -282,7 +282,7 @@
<!-- ************************************************************ -->
- <function name="ldifDiff">
+ <function name="ldifDiff" scope="local">
<function-prolog>
This function compares two LDIF files and reports the differences in LDIF format
</function-prolog>
@@ -429,7 +429,7 @@
<!-- ************************************************************ -->
- <function name="grep">
+ <function name="grep" scope="local">
<function-prolog>
This function compares grep a string in a file
</function-prolog>
@@ -557,7 +557,7 @@
<!-- ************************************************************ -->
- <function name="getOSvariables">
+ <function name="getOSvariables" scope="local">
<function-prolog>
Get OS related variables
</function-prolog>
@@ -583,7 +583,7 @@
<!-- ************************************************************ -->
- <function name="getOSDate">
+ <function name="getOSDate" scope="local">
<function-prolog>
This function returns the date (MONTH/DAY/YEARS-HOURS/MIN) of the OS
</function-prolog>
diff --git a/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict.xml b/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict.xml
index 51748d4..74e6f2e 100755
--- a/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="verdict">
+ <function name="verdict" scope="local">
<function-map-args>
<function-arg-def name="instances" type="required">
<function-arg-description>
@@ -137,18 +137,17 @@
</sequence>
</paralleliterate>
+
+ <!--========== Merge files ==========-->
+ <call function="'mergeFiles'">
+ {
+ 'fileList' : fileList,
+ 'fileFd' : LOG_MAIN_FD
+ }
+ </call>
</sequence>
</if>
-
- <!--========== Merge files ==========-->
- <call function="'mergeFiles'">
- {
- 'fileList' : fileList,
- 'fileFd' : LOG_MAIN_FD
- }
- </call>
-
<!--========== Call postphase =========-->
<call function="'phasePostamble'">
{
diff --git a/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict_opends.xml b/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict_opends.xml
index d14030f..6dce9ac 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict_opends.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/verdict/verdict_opends.xml
@@ -31,7 +31,7 @@
<!-- ************************************************************ -->
- <function name="verdictOpends">
+ <function name="verdictOpends" scope="local">
<function-map-args>
<function-arg-def name="instance" type="required">
<function-arg-description>
@@ -126,7 +126,7 @@
</function>
<!-- ************************************************************ -->
- <function name="checkReplicationSynchro">
+ <function name="checkReplicationSynchro" scope="local">
<function-map-args>
<function-arg-def name="instance" type="required">
<function-arg-description>
@@ -153,7 +153,7 @@
</function>
<!-- ************************************************************ -->
- <function name="checkLogs">
+ <function name="checkLogs" scope="local">
<function-map-args>
<function-arg-def name="location" type="optional"
default="STAF_REMOTE_HOSTNAME">
diff --git a/opendj-sdk/opends/tests/system-tests/scenario/sample/sample.xml b/opendj-sdk/opends/tests/system-tests/scenario/sample/sample.xml
index d7dd453..e3f8cd9 100755
--- a/opendj-sdk/opends/tests/system-tests/scenario/sample/sample.xml
+++ b/opendj-sdk/opends/tests/system-tests/scenario/sample/sample.xml
@@ -29,7 +29,7 @@
<defaultcall function="mainSample"/>
- <function name="mainSample">
+ <function name="mainSample" scope="local">
<sequence>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/phases/main_run.xml' % (TESTS_DIR)"/>
--
Gitblit v1.10.0