From ccb383c5308f88916e6946ef9479cedef8d98481 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Tue, 04 Aug 2009 10:14:21 +0000
Subject: [PATCH] refactoring to use different backend types
---
opends/tests/staf-tests/shared/functions/dsadm.xml | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index f813b1c..fe50812 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2009 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,7 +52,7 @@
</function>
<!-- This function sets up DS using the setup script -->
- <function name="SetUpDsWithScript">
+ <function name="SetUpDsWithScript" scope="local">
<function-prolog>
This function sets up a Directory Server using a script
</function-prolog>
@@ -135,6 +135,12 @@
</function-arg-description>
<function-arg-property name="help" value="option"/>
</function-arg-def>
+ <function-arg-def name="expectedRC" type="optional" default="0">
+ <function-arg-description>
+ Expected return code value. Default value is 0.
+ Wildcard 'noCheck' to not check the RC
+ </function-arg-description>
+ </function-arg-def>
<function-arg-def name="knownIssue" type="optional" default="None">
<function-arg-description>
Known issue. Corresponds to an issue number.
@@ -197,7 +203,7 @@
'command' : STAFCmd,
'arguments' : STAFCmdParams,
'path' : dsPath,
- 'expectedRC': 'noCheck',
+ 'expectedRC': expectedRC,
'knownIssue': knownIssue
}
</call>
@@ -2893,7 +2899,9 @@
</script>
<!-- Copy the schema-task ldif to remote host -->
- <message>'Copy schema task ldif file.'</message>
+ <message>
+ 'Copy schema task ldif file %s to %s.' % (tmpTaskLdif,taskLdif)
+ </message>
<call function="'copyFile'">
{ 'location' : STAXServiceMachine,
'srcfile' : tmpTaskLdif,
--
Gitblit v1.10.0