From 4b8f425bb8ea124dd4c1b5af8aef7b396e96a0e1 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Tue, 11 Dec 2007 18:52:16 +0000
Subject: [PATCH] allow silent mode (default value) for runcmd() and addEntry()
---
opends/tests/shared/functions/ldap.xml | 19 +++++++++++++------
opends/tests/shared/functions/utils.xml | 14 +++++++++++---
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/opends/tests/shared/functions/ldap.xml b/opends/tests/shared/functions/ldap.xml
index 1c3c14c..77e94ed 100755
--- a/opends/tests/shared/functions/ldap.xml
+++ b/opends/tests/shared/functions/ldap.xml
@@ -83,8 +83,14 @@
<function-arg-description>
Expected return code value. Default value is 0
</function-arg-description>
- <function-arg-property name="type" value="integer"/>
- </function-arg-def>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
+ <function-arg-def name="verbose" type="optional" default="False">
+ <function-arg-description>
+ Display (or not) output. Default is True
+ </function-arg-description>
+ <function-arg-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- Local variables -->
@@ -117,10 +123,11 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
<call function="'runCommand'">
- { 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : mylocation,
- 'name' : 'Add Entry From LDIF'
+ { 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : mylocation,
+ 'name' : 'Add Entry From LDIF',
+ 'verbose' : verbose
}
</call>
<script>
diff --git a/opends/tests/shared/functions/utils.xml b/opends/tests/shared/functions/utils.xml
index 471cf6b..c9559eb 100755
--- a/opends/tests/shared/functions/utils.xml
+++ b/opends/tests/shared/functions/utils.xml
@@ -1430,6 +1430,12 @@
The duration that the process is allowed to run
</function-arg-description>
</function-arg-def>
+ <function-arg-def name="verbose" default="False" type="optional">
+ <function-arg-description>
+ A boolean (use True or False here, case matters) to output the
+ outputs of the command
+ </function-arg-description>
+ </function-arg-def>
</function-map-args>
<sequence>
<script>
@@ -1461,9 +1467,11 @@
</process>
</block>
- <message level="'info'">
- '%s: Command returned:\n%s' % (_id,STAXResult[0][1])
- </message>
+ <if expr="verbose == True">
+ <message level="'info'">
+ '%s: Command returned:\n%s' % (_id,STAXResult[0][1])
+ </message>
+ </if>
<script>
def dig(var):
try:
--
Gitblit v1.10.0