From e14ed0ae5032b80c3ee37ca440c757723403ae25 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Thu, 08 Mar 2012 17:13:25 +0000
Subject: [PATCH] Re-write of password policy functional tests part 1
---
opends/tests/staf-tests/shared/functions/dsconfig.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/dsconfig.xml b/opends/tests/staf-tests/shared/functions/dsconfig.xml
index e8aece7..686972c 100755
--- a/opends/tests/staf-tests/shared/functions/dsconfig.xml
+++ b/opends/tests/staf-tests/shared/functions/dsconfig.xml
@@ -193,12 +193,12 @@
'%s %s' % (STAFCmd, STAFCmdParams)
</message>
<call function="'runCommand'">
- { 'name' : 'Modify dsconfig object',
- 'location' : location,
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'expectedRC': expectedRC,
- 'knownIssue': knownIssue
+ { 'name' : 'Modify dsconfig object',
+ 'location' : location,
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
}
</call>
@@ -475,6 +475,13 @@
<function-arg-property name="type" value="string" />
</function-arg-def>
+ <function-arg-def name="expectedString" type="optional" default="None">
+ <function-arg-description>
+ Expected return string value.
+ </function-arg-description>
+ <function-arg-property name="type" value="string" />
+ </function-arg-def>
+
<function-arg-def name="knownIssue" type="optional" default="None">
<function-arg-description>
Known issue. Corresponds to an issue number.
@@ -504,12 +511,13 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
<call function="'runCommand'">
- { 'name' : 'execute dsconfig subcommand',
- 'location' : location,
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'expectedRC': expectedRC,
- 'knownIssue': knownIssue
+ { 'name' : 'execute dsconfig subcommand',
+ 'location' : location,
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'expectedRC' : expectedRC,
+ 'expectedString' : expectedString,
+ 'knownIssue' : knownIssue
}
</call>
<return>
--
Gitblit v1.10.0