From 775697b577b54f9cfe36c8216e6e45b4da81ba1e Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Tue, 04 Mar 2008 10:15:17 +0000
Subject: [PATCH] Fix importLdifTask() : add expectedRC parameter
---
opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml | 92 ++++++++++++------------------
opendj-sdk/opends/tests/shared/functions/dsadm.xml | 44 ++++++++++----
2 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
index 741b25e..6d58532 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/privileges/privileges_import_task.xml
@@ -95,13 +95,11 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, Admin adding privilege'
@@ -128,13 +126,11 @@
'dsInstanceDn' : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
'dsInstancePswd' : 'ACIRules',
'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, Admin adding ACI'
@@ -168,10 +164,6 @@
'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, Admin deleting global ACI'
@@ -262,18 +254,16 @@
</message>
<call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir,
+ 'expectedRC' : 50
}
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, Directory Manager, alternative root user putting back privilege'
@@ -295,18 +285,15 @@
</message>
<call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, Directory Manager, alternative root user searching entry'
@@ -394,18 +381,16 @@
</message>
<call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : 'cn=Zroot' ,
- 'dsInstancePswd' : 'PrivsRule' ,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
- }
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : 'cn=Zroot' ,
+ 'dsInstancePswd' : 'PrivsRule' ,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir,
+ 'expectedRC' : 50
+ }
</call>
-
- <if expr="RC != 50">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, New Root User, alternative root user putting back privilege'
@@ -427,18 +412,15 @@
</message>
<call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : 'cn=Zroot' ,
- 'dsInstancePswd' : 'PrivsRule' ,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' % logsRemoteDataDir
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : 'cn=Zroot' ,
+ 'dsInstancePswd' : 'PrivsRule' ,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/privileges/privileges_import_task/import_task.ldif' \
+ % logsRemoteDataDir
}
</call>
-
- <if expr="STAFCmdRC != 0">
- <tcstatus result="'fail'"/>
- </if>
<message>
'Privileges: Import Tasks: import-ldif, New Root User, alternative root user searching entry'
diff --git a/opendj-sdk/opends/tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
index c591456..e9953c3 100755
--- a/opendj-sdk/opends/tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/shared/functions/dsadm.xml
@@ -1123,6 +1123,13 @@
</function-arg-description>
<function-arg-property name="type" 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-property name="type" value="integer"/>
+ </function-arg-def>
</function-map-args>
<sequence>
@@ -1208,7 +1215,9 @@
'dsPort' : dsInstancePort,
'dsBindDn' : dsInstanceDn,
'dsBindPswd' : dsInstancePswd,
- 'dsTaskLdif' : taskLdif }
+ 'dsTaskLdif' : taskLdif,
+ 'expectedRC' : expectedRC
+ }
</call>
<script>
@@ -1229,6 +1238,11 @@
'noOfLoops' : numLdapCheckTries,
'sleepMilliSeconds' : sleepBetweenLdapCheckTries }
</call>
+ <message>'Check CheckLdapTask returns RC=0'</message>
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
</sequence>
</if>
@@ -3084,6 +3098,12 @@
</function-arg-description>
<function-arg-property name="type" value="filename"/>
</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-map-args>
<sequence>
@@ -3142,9 +3162,11 @@
STAFCmdResult=STAXResult
</script>
- <call function="'checkRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAFCmdResult }
+ <call function="'checktestRC'">
+ { 'returncode' : STAFCmdRC,
+ 'result' : STAFCmdResult,
+ 'expected' : expectedRC
+ }
</call>
<return>[STAFCmdRC, STAFCmdResult[0][1]]</return>
@@ -3278,10 +3300,11 @@
<!-- Search for task status -->
<call function="'runCommand'">
- { 'name' : 'Search On line Import Task',
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'location' : myLocation
+ { 'name' : 'Search On line Import Task',
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'location' : myLocation,
+ 'expectedRC' : 'noCheck'
}
</call>
@@ -3313,11 +3336,6 @@
</message>
</else>
</if>
-
- <call function="'checkRC'">
- { 'returncode' : STAFCmdRC ,
- 'result' : STAFCmdResult }
- </call>
<message>
'Sleeping for %s ms' % sleepMilliSeconds
--
Gitblit v1.10.0