Fix privileges testcases

Christophe Sovant

27.51.2008 4310f18b58815e259698e7dd1d6dc43331040464

Fix privileges testcases

 opends/tests/functional-tests/testcases/privileges/privileges_backup_task.xml

@@ -95,14 +95,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '3' ,
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, Admin adding privilege'
                </message>
@@ -128,14 +125,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '3' ,
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, Admin adding global ACI'
                </message>
@@ -169,10 +163,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, Admin deleting privilege'
                </message>
@@ -213,16 +203,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '3.1' ,
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult ,
                    'expected'   : 50 }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>
@@ -266,10 +251,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, Directory Manager, alternative root user removing privilege'
                </message>
@@ -295,14 +276,11 @@
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD  ,
                  'taskID'           : '3.3' ,
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, Directory Manager, alternative root user putting back privilege'
                </message>
@@ -332,11 +310,6 @@
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : STAFCmdRC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>
@@ -392,10 +365,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, New Root User, alternative root user removing privilege'
                </message>
@@ -421,14 +390,11 @@
                  'dsInstanceDn'     : 'cn=Zroot' ,
                  'dsInstancePswd'   : 'PrivsRule' ,
                  'taskID'           : '3.6' ,
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir
                  'backupDir'        : '%s/privileges/' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Backup Tasks: backend-backup, New Root User, alternative root user putting back privilege'
                </message>
@@ -458,11 +424,6 @@
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : STAFCmdRC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>

 opends/tests/functional-tests/testcases/privileges/privileges_directory_manager.xml

@@ -528,11 +528,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -644,11 +639,6 @@
                    'changetype'             : 'replace' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -747,11 +737,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1061,11 +1046,6 @@
                    'changetype'             : 'replace' }
                </call>

                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1267,11 +1247,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1379,11 +1354,6 @@
                    'changetype'             : 'replace' }
                </call>
                
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1712,11 +1682,6 @@
                    'changetype'             : 'delete' }
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1772,13 +1737,10 @@
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-shutdown, alternate root user putting back privilege'
                </message>
@@ -1916,13 +1878,10 @@
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Directory Manager: server-restart, alternate root user putting back privilege'
                </message>
@@ -1952,11 +1911,6 @@
                }
                </call>
                
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>

 opends/tests/functional-tests/testcases/privileges/privileges_export_task.xml

@@ -97,14 +97,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '1' ,
                  'ldifFile'         : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
                  'ldifFile'         : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif, Admin adding privilege'
                </message>
@@ -130,14 +127,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '1' ,
                  'ldifFile'         : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir
                  'ldifFile'         : '%s/privileges/export_task_out.ldif' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif, Admin adding global ACI'
                </message>
@@ -171,10 +165,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif, Admin deleting privilege'
                </message>
@@ -215,16 +205,11 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules' ,
                  'taskID'           : '1.1' ,
                  'ldifFile'         : '%s/privileges/export_task_out2.ldif' % logsRemoteDataDir
                  'ldifFile'         : '%s/privileges/export_task_out2.ldif' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult ,
                    'expected'   : 50 }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>
@@ -268,10 +253,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif, Directory Manager, alternative root user removing privilege'
                </message>
@@ -297,14 +278,11 @@
                  'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                  'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD ,
                  'taskID'           : '1.2' ,
                  'ldifFile'         : '%s/privileges/export_task_out4.ldif' % logsRemoteDataDir
                  'ldifFile'         : '%s/privileges/export_task_out4.ldif' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif, Directory Manager, alternative root user putting back privilege'
                </message>
@@ -334,11 +312,6 @@
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : STAFCmdRC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>
@@ -394,10 +367,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif,  New Root User, alternative root user removing privilege'
                </message>
@@ -423,14 +392,11 @@
                  'dsInstanceDn'     : 'cn=Zroot' ,
                  'dsInstancePswd'   : 'PrivsRule' ,
                  'taskID'           : '1.5' ,
                  'ldifFile'         : '%s/privileges/export_task_out7.ldif' % logsRemoteDataDir
                  'ldifFile'         : '%s/privileges/export_task_out7.ldif' % logsRemoteDataDir ,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Export Tasks: export-ldif,  New Root User, alternative root user putting back privilege'
                </message>
@@ -460,11 +426,6 @@
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : STAFCmdRC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>

 opends/tests/functional-tests/testcases/privileges/privileges_new_root_user.xml

@@ -89,11 +89,6 @@
                    'entryToBeAdded'      : '%s/privileges/add_new_root_user.ldif' % logsRemoteDataDir }
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -553,11 +548,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -666,11 +656,6 @@
                    'changetype'             : 'replace' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -767,11 +752,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1074,11 +1054,6 @@
                    'changetype'             : 'replace' }
                </call>

                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1273,11 +1248,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1382,11 +1352,6 @@
                    'changetype'             : 'replace' }
                </call>
                
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1702,11 +1667,6 @@
                    'changetype'             : 'delete' }
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1761,13 +1721,10 @@
                  'dsInstanceDn'     : 'cn=Zroot' ,
                  'dsInstancePswd'   : 'PrivsRule' ,
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: server-shutdown, alternative root user putting back privilege'
                </message>
@@ -1903,13 +1860,10 @@
                  'dsInstanceDn'     : 'cn=Zroot' ,
                  'dsInstancePswd'   : 'PrivsRule' ,
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: New Root User: server-restart, alternative root user putting back privilege'
                </message>
@@ -1938,11 +1892,6 @@
                }
                </call>
                
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>

 opends/tests/functional-tests/testcases/privileges/privileges_restore_task.xml

@@ -102,10 +102,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Admin adding backup task'
                </message>
@@ -120,10 +116,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Admin deleting entry'
                </message>
@@ -177,14 +169,11 @@
                    'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                    'dsInstancePswd'   : 'ACIRules',
                    'taskID'           : '6.1',
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
                    'expectedRC'       : 50
                  }
                </call>
      
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Admin adding global ACI'
                </message>
@@ -218,10 +207,6 @@
                  }
                </call>
      
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Admin deleting global ACI'
                </message>
@@ -307,10 +292,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user adding backup task'
                </message>
@@ -325,10 +306,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user deleting entry'
                </message>
@@ -382,14 +359,11 @@
                    'dsInstanceDn'     : DIRECTORY_INSTANCE_DN ,
                    'dsInstancePswd'   : DIRECTORY_INSTANCE_PSWD,
                    'taskID'           : '6.4',
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
                    'expectedRC'       : 50
                  }
                </call>
      
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user putting back privilege'
                </message>
@@ -419,10 +393,6 @@
                  }
                </call>
      
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                  'Privileges: Restore Tasks: backend-restore, Directory Manager, alternative root user searching entry'
                </message>
@@ -506,10 +476,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, New User Root, new root user adding backup task'
                </message>
@@ -524,10 +490,6 @@
                }
                </call>
    
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user deleting entry'
                </message>
@@ -581,14 +543,11 @@
                    'dsInstanceDn'     : 'cn=Zroot' ,
                    'dsInstancePswd'   : 'PrivsRule' ,
                    'taskID'           : '6.7',
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir
                    'backupDir'        : '%s/privileges/privileges_restore_task/' % logsRemoteDataDir,
                    'expectedRC'       : 50
                  }
                </call>
      
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user putting back privilege'
                </message>
@@ -618,10 +577,6 @@
                  }
                </call>
      
                <if expr="RC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                  'Privileges: Restore Tasks: backend-restore, New User Root, alternative root user searching entry'
                </message>

 opends/tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml

@@ -124,13 +124,6 @@
                }
              </call>
              
              <call function="'checktestRC'">
                { 
                'returncode' : RC ,
                'result'     : STAXResult  
                }
              </call>
              
              <call function="'testCase_Postamble'"/>
              
            </sequence>

 opends/tests/functional-tests/testcases/privileges/privileges_users.xml

@@ -1059,11 +1059,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1250,11 +1245,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1437,11 +1427,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -1588,11 +1573,6 @@
                    'changetype'             : 'delete' }
                </call>
    
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2102,11 +2082,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2377,11 +2352,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2572,11 +2542,6 @@
                  }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult  }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2776,11 +2741,6 @@
                    'changetype'             : 'delete' }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult  }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2937,11 +2897,6 @@
                    'changetype'             : 'delete' }
                </call>
                
                <call function="'checktestRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              
                <call function="'testCase_Postamble'"/>
    
              </sequence>
@@ -2985,13 +2940,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
               
                <message>
                   'Privileges: Users: server-shutdown, Admin adding privilege'
                </message>
@@ -3017,13 +2969,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>

                <message>
                   'Privileges: Users: server-shutdown, Admin adding ACI'
                </message>
@@ -3111,13 +3060,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
               
                <message>
                   'Privileges: Users: server-shutdown, Admin removing ACI'
                </message>
@@ -3143,15 +3089,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult ,
                    'expected'   : 50 }
                </call>
                     
                <call function="'testCase_Postamble'"/>
    
            </sequence>
@@ -3195,13 +3136,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
               
                <message>
                   'Privileges: Users: server-restart, Admin adding privilege'
                </message>
@@ -3227,13 +3165,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: server-restart, Admin adding ACI'
                </message>
@@ -3266,10 +3201,6 @@
                }
                </call>
    
                <if expr="STAFCmdRC != 0">
                    <tcstatus result="'fail'"/>
                </if>
                
                <message>
                   'Privileges: Users: server-restart, Admin deleting privilege'
                </message>
@@ -3296,13 +3227,10 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <if expr="RC != 50">
                    <tcstatus result="'fail'"/>
                </if>
               
                <message>
                   'Privileges: Users: server-restart, Admin removing ACI'
                </message>
@@ -3328,14 +3256,9 @@
                  'dsInstanceDn'     : 'uid=auser,o=Privileges Tests,dc=example,dc=com' ,
                  'dsInstancePswd'   : 'ACIRules',
                  'taskID'           : STAXCurrentTestcase,
                  'expectedRC'       : 50
                }
                </call>
    
                <call function="'checktestRC'">
                  { 'returncode' : RC ,
                    'result'     : STAXResult ,
                    'expected'   : 50 }
                </call>
                -->     
                <call function="'testCase_Postamble'"/>
    

 opends/tests/shared/functions/dsadm.xml

@@ -1216,8 +1216,7 @@
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC
        }
          'expectedRC' : expectedRC }
      </call>

      <script>
@@ -1679,6 +1678,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>
@@ -1758,7 +1764,8 @@
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif }
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }
      </call>

      <script>
@@ -1777,6 +1784,11 @@
              'dsBindDn'   : dsInstanceDn,
              'dsBindPswd' : dsInstancePswd }
           </call>
           <message>'Check CheckLdapTask returns RC=0'</message>
            <call function="'checktestRC'">
              { 'returncode' : RC ,
                'result'     : STAXResult }
            </call>           
        </sequence>
      </if>
    </sequence>
@@ -2009,6 +2021,13 @@
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </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>
@@ -2075,7 +2094,8 @@
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif }
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }
      </call>

      <script>
@@ -2094,6 +2114,11 @@
              'dsBindDn'   : dsInstanceDn,
              'dsBindPswd' : dsInstancePswd }
            </call>
            <message>'Check CheckLdapTask returns RC=0'</message>
            <call function="'checktestRC'">
             { 'returncode' : RC ,
               'result'     : STAXResult }
            </call>
        </sequence>
      </if>  
    </sequence>
@@ -2281,6 +2306,13 @@
        </function-arg-description>
        <function-arg-property name="type" value="boolean"/>
      </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>
@@ -2339,7 +2371,8 @@
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif }
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }
      </call>

      <script>
@@ -2358,6 +2391,11 @@
              'dsBindDn'   : dsInstanceDn,
              'dsBindPswd' : dsInstancePswd }
            </call>
            <message>'Check CheckLdapTask returns RC=0'</message>
            <call function="'checktestRC'">
              { 'returncode' : RC ,
                'result'     : STAXResult }
            </call>
         </sequence>
      </if>
    </sequence>
@@ -2412,6 +2450,13 @@
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </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>
@@ -2466,7 +2511,8 @@
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif }
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }
      </call>

      <script>
@@ -2526,6 +2572,13 @@
        </function-arg-description>
        <function-arg-property name="type" value="string"/>
      </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>
@@ -2580,7 +2633,8 @@
          'dsPort'     : dsInstancePort,
          'dsBindDn'   : dsInstanceDn,
          'dsBindPswd' : dsInstancePswd,
          'dsTaskLdif' : taskLdif }
          'dsTaskLdif' : taskLdif,
          'expectedRC' : expectedRC }
      </call>
      
      <script>