From fa49ead796d79a111edea9643ed130e4f3be875a Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 06 May 2008 16:40:31 +0000
Subject: [PATCH] doing some cleanup
---
opends/tests/system-tests/phases/main_run_lib.xml | 9 +--
opends/tests/system-tests/phases/scheduler/scheduler.xml | 42 ++++---------
opends/tests/system-tests/phases/log/log.xml | 60 ++++++-------------
opends/tests/system-tests/phases/installation/installation_opends.xml | 12 +--
4 files changed, 41 insertions(+), 82 deletions(-)
diff --git a/opends/tests/system-tests/phases/installation/installation_opends.xml b/opends/tests/system-tests/phases/installation/installation_opends.xml
index ace538a..c1c683f 100755
--- a/opends/tests/system-tests/phases/installation/installation_opends.xml
+++ b/opends/tests/system-tests/phases/installation/installation_opends.xml
@@ -311,10 +311,8 @@
<!-- ************************************************************ -->
<function name="removeProcessIfNeeded" scope="local">
<function-map-args>
- <function-arg-def name="location" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="location" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
@@ -405,8 +403,7 @@
<!-- ************************************************************ -->
<function name="updateMissingParameters" scope="local">
<function-map-args>
- <function-arg-def name="instance" type="required">
- </function-arg-def>
+ <function-arg-def name="instance" type="required"/>
</function-map-args>
<sequence>
@@ -467,8 +464,7 @@
<!-- ************************************************************ -->
<function name="getOpendsBuildID" scope="local">
<function-map-args>
- <function-arg-def name="instance" type="required">
- </function-arg-def>
+ <function-arg-def name="instance" type="required"/>
</function-map-args>
<sequence>
diff --git a/opends/tests/system-tests/phases/log/log.xml b/opends/tests/system-tests/phases/log/log.xml
index b41c722..dfb2772 100755
--- a/opends/tests/system-tests/phases/log/log.xml
+++ b/opends/tests/system-tests/phases/log/log.xml
@@ -72,12 +72,9 @@
'return a log file name'
</function-prolog>
<function-map-args>
- <function-arg-def name="type" type="required">
- </function-arg-def>
- <function-arg-def name="object" type="required">
- </function-arg-def>
- <function-arg-def name="prefix" type="required">
- </function-arg-def>
+ <function-arg-def name="type" type="required"/>
+ <function-arg-def name="object" type="required"/>
+ <function-arg-def name="prefix" type="required"/>
</function-map-args>
<sequence>
@@ -112,10 +109,8 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="scenario" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="scenario" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<script>
@@ -179,8 +174,7 @@
scheduler object
</function-arg-description>
</function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<iterate in="scheduler" var="module">
@@ -247,10 +241,8 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="fileList" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="fileList" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
@@ -419,16 +411,11 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="returncode" type="required">
- </function-arg-def>
- <function-arg-def name="expected" type="required">
- </function-arg-def>
- <function-arg-def name="result" type="required">
- </function-arg-def>
- <function-arg-def name="status" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="returncode" type="required"/>
+ <function-arg-def name="expected" type="required"/>
+ <function-arg-def name="result" type="required"/>
+ <function-arg-def name="status" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<if expr="fileFd == NO_FILE">
@@ -460,8 +447,7 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="tagName">
- </function-arg-def>
+ <function-arg-def name="tagName"/>
<function-arg-def name="fileFd" type="required">
<function-arg-description>
file descriptor
@@ -504,8 +490,7 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="instance" type="required">
- </function-arg-def>
+ <function-arg-def name="instance" type="required"/>
<function-arg-def name="fileFd" type="required">
<function-arg-description>
file descriptor
@@ -699,8 +684,7 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<if expr="fileFd != NO_FILE">
@@ -719,10 +703,8 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="nodeName" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="nodeName" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<if expr="fileFd != NO_FILE">
@@ -740,10 +722,8 @@
''
</function-prolog>
<function-map-args>
- <function-arg-def name="nodeName" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="nodeName" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
<if expr="fileFd != NO_FILE">
diff --git a/opends/tests/system-tests/phases/main_run_lib.xml b/opends/tests/system-tests/phases/main_run_lib.xml
index dbe6ecd..70f9a21 100644
--- a/opends/tests/system-tests/phases/main_run_lib.xml
+++ b/opends/tests/system-tests/phases/main_run_lib.xml
@@ -99,12 +99,9 @@
clients list
</function-arg-description>
</function-arg-def>
- <function-arg-def name="runInstallation" type="required">
- </function-arg-def>
- <function-arg-def name="runConfiguration" type="required">
- </function-arg-def>
- <function-arg-def name="runScheduler" type="required">
- </function-arg-def>
+ <function-arg-def name="runInstallation" type="required"/>
+ <function-arg-def name="runConfiguration" type="required"/>
+ <function-arg-def name="runScheduler" type="required"/>
</function-map-args>
<sequence>
diff --git a/opends/tests/system-tests/phases/scheduler/scheduler.xml b/opends/tests/system-tests/phases/scheduler/scheduler.xml
index 2058290..cfb3dcb 100755
--- a/opends/tests/system-tests/phases/scheduler/scheduler.xml
+++ b/opends/tests/system-tests/phases/scheduler/scheduler.xml
@@ -109,14 +109,10 @@
<!-- ************************************************************ -->
<function name="runClients" scope="local">
<function-map-args>
- <function-arg-def name="clients" type="required">
- </function-arg-def>
- <function-arg-def name="instances" type="required">
- </function-arg-def>
- <function-arg-def name="scenario" type="required">
- </function-arg-def>
- <function-arg-def name="suffix" type="required">
- </function-arg-def>
+ <function-arg-def name="clients" type="required"/>
+ <function-arg-def name="instances" type="required"/>
+ <function-arg-def name="scenario" type="required"/>
+ <function-arg-def name="suffix" type="required"/>
</function-map-args>
<sequence>
@@ -278,16 +274,11 @@
<!-- ************************************************************ -->
<function name="runClient" scope="local">
<function-map-args>
- <function-arg-def name="client" type="required">
- </function-arg-def>
- <function-arg-def name="duration" type="required">
- </function-arg-def>
- <function-arg-def name="instances" type="required">
- </function-arg-def>
- <function-arg-def name="suffix" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ <function-arg-def name="client" type="required"/>
+ <function-arg-def name="duration" type="required"/>
+ <function-arg-def name="instances" type="required"/>
+ <function-arg-def name="suffix" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
@@ -579,16 +570,11 @@
<function name="sleepForDependency" scope="local">
<function-map-args>
<function-arg-def name="location" type="optional"
- default="'%s' % STAXServiceMachine">
- </function-arg-def>
- <function-arg-def name="client" type="required">
- </function-arg-def>
- <function-arg-def name="clients" type="required">
- </function-arg-def>
- <function-arg-def name="durationTime" type="required">
- </function-arg-def>
- <function-arg-def name="fileFd" type="required">
- </function-arg-def>
+ default="'%s' % STAXServiceMachine"/>
+ <function-arg-def name="client" type="required"/>
+ <function-arg-def name="clients" type="required"/>
+ <function-arg-def name="durationTime" type="required"/>
+ <function-arg-def name="fileFd" type="required"/>
</function-map-args>
<sequence>
--
Gitblit v1.10.0