opends/tests/staf-tests/functional-tests/testcases/core/binaryattr/core_binaryattr_tests.xml
@@ -449,7 +449,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -478,7 +478,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -622,7 +622,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -651,7 +651,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -801,7 +801,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -830,7 +830,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -980,7 +980,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> @@ -1009,7 +1009,7 @@ { 'functionName' : 'checktestString' , 'functionMessage' : 'Check userCertificate attribute is returned.' , 'functionException' : 'Utils.CheckStringException' , 'functionArguments' : { 'expectedString' : 'userCertificate;binary' , 'functionArguments' : { 'expectedString' : 'usercertificate;binary' , 'returnString' : _functionResult } } </call> opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_provider.xml
@@ -308,7 +308,7 @@ 'dsBaseDN' : 'cn=System Info,cn=monitor', 'dsFilter' : 'objectclass=*', 'expectedRC' : 0 , 'knownIssue' : '2619' } 'knownIssue' : '2873' } </call> <message>'-- Disable the System Info monitor provider --'</message> opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -269,9 +269,9 @@ <call function="'checktestString'"> { 'returnString' : returnString , 'expectedString' : 'Account Expiration Time:' } </call> </call> <message> <message> 'Security: Account Expiration: verify manage-account %s' % msg3 </message> @@ -287,11 +287,32 @@ returnString = STAXResult[0][1] </script> <call function="'checktestString'"> { 'returnString' : returnString , 'expectedString' : '%s 8926' % msg5 } </call> <script> expirationTime = returnString.split(':')[1].strip() if len(expirationTime) == 9 & expirationTime.startswith('86'): myRC = 0 else: myRC = 1 </script> <if expr="myRC== 0"> <sequence> <message log="1"> 'SUCCESS: Expiration (%s) time contains 9 digit and starts with 86' % expirationTime </message> <tcstatus result="'pass'"/> </sequence> <else> <sequence> <message log="1" level="'Error'"> 'ERROR : Expiration time (%s) didn\'t match the expected expression' % expirationTime </message> <tcstatus result="'fail'"/> </sequence> </else> </if> <message> 'Security: Account Expiration: verify manage-account %s' % msg4 </message> opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
@@ -403,7 +403,7 @@ msg4 = 'configuration parameter of the SNMP connection handler' msg5 = 'is the valid path to the jdmkrt.jar file and that the' msg6 = 'file is accessible' msg = '%s %s %s %s %s %s' % (msg1, msg2, msg3, msg4, msg5, msg6) msg = '%s %s %s %s %s %s' % (msg1, msg2, msg3, msg4, msg5, msg6) </script> <call function="'grep'"> opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -75,6 +75,12 @@ { 'location' : STAF_REMOTE_HOSTNAME } </call> <!--- Check that DS started --> <call function="'isAlive'"> { 'noOfLoops' : 10 , 'noOfMilliSeconds' : 2000 } </call> <call function="'backup'"> { 'location' : STAF_REMOTE_HOSTNAME , 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST, @@ -487,11 +493,22 @@ { 'location' : STAF_REMOTE_HOSTNAME } </call> <call function="'checktestStringNotPresent'"> {'testString' : 'because another task already exists with the same ID' , 'returnString' : returnString, 'issue' : '3773'} </call> <!--- Check that DS started --> <call function="'isAlive'"> { 'noOfLoops' : 10 , 'noOfMilliSeconds' : 2000 } </call> <call function="'grep'"> { 'location' : STAF_REMOTE_HOSTNAME , 'filename' : '%s/%s/logs/server.out' % (DIRECTORY_INSTANCE_DIR, OPENDSNAME) , 'testString': 'because another task already exists with the same ID' , 'expectedRC': 1 , } </call> <call function="'testCase_Postamble'"/> </sequence> opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml
@@ -144,10 +144,16 @@ <call function="'testCase_Preamble'"/> <script> mydate=strftime("%Y%m%d%H%M%S",localtime()) import java.util.Calendar import java.text.SimpleDateFormat cal = java.util.Calendar.getInstance() cal.add(java.util.Calendar.SECOND,10) dateFormat = java.text.SimpleDateFormat("yyyyMMddHHmmss") mydate = dateFormat.format(cal.getTime()) </script> <call function="'restore'"> { 'location' : STAF_REMOTE_HOSTNAME , opends/tests/staf-tests/shared/ant/staf.xml
@@ -32,7 +32,6 @@ <!-- Install STAF and services --> <target name="install"> <echo>Installing staf, please wait...</echo> <if> <not> <available file="${staf.install.dir}/bin/STAF.cfg"/> opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -1959,12 +1959,11 @@ if startTask: STAFCmdParamsList.append('-t %s' % startTask) if schedulePattern: STAFCmdParamsList.append('--recurringTask %s' % schedulePattern) if backupID: STAFCmdParamsList.append('-I %s' % backupID) if schedulePattern: STAFCmdParamsList.append('--recurringTask %s' % schedulePattern) STAFCmdParams=' '.join(STAFCmdParamsList) @@ -2321,12 +2320,12 @@ if startTask: STAFCmdParamsList.append('-t %s' % startTask) if backupID: STAFCmdParamsList.append('-I %s' % backupID) if schedulePattern: STAFCmdParamsList.append('--recurringTask %s' % schedulePattern) if backupID: STAFCmdParamsList.append('-I %s' % backupID) STAFCmdParams=' '.join(STAFCmdParamsList) </script> opends/tests/staf-tests/shared/staf/staf-controller.cfg
@@ -49,7 +49,8 @@ SERVICE Stax LIBRARY JSTAF \ EXECUTE {STAF/Config/STAFRoot}/services/stax/STAX.jar \ OPTION J2="-Xms1g -Xmx1g -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m -XX:SurvivorRatio=6 -XX:PermSize=256m -XX:MaxPermSize=256m -Xoss1m -Xss1m" \ OPTION JVM=${local.javahome}/bin/java OPTION JVM=${local.javahome}/bin/java \ PARMS "PYTHONOUTPUT JobUserLogAndMsg" "PYTHONLOGLEVEL Info" # EVENT SERVICE CONFIGURATION SERVICE Event LIBRARY JSTAF \ @@ -77,7 +78,7 @@ # DSML SERVICE CONFIGURATION SERVICE Dsml LIBRARY JSTAF \ EXECUTE {STAF/Config/STAFRoot}/services/dsml/dsmlService.jar \ EXECUTE {STAF/Config/STAFRoot}/services/DSML/dsmlService.jar \ OPTION JVMNAME=dsmlJVM \ OPTION J2=-Xmx512m -Xms128m \ OPTION JVM=${local.javahome}/bin/java opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -67,7 +67,7 @@ WC_SSL_PORT = '9001' WC_HOST = '${remote.hostname}' DSML_WARNAME = '${opends.name}-DSML.war' DSML_WARPATH = '${opends.dir}/build/package/${opends.name}-DSML.war' DSML_WARPATH = '${opends.dir}/${opends.name}-DSML.war' SNMP_OPENDS_JARFILE = '${opends.name}/lib/extensions/snmp-mib2605.jar' SNMP_OPENDMK_LIBDIR = '${snmp.opendmk.lib.dir}' SNMP_OPENDMK_JARFILE = '${snmp.opendmk.lib.dir}/jdmkrt.jar' opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -973,7 +973,7 @@ <script> srcFile = '%s/logs/MACHINE/%s/GLOBAL/STAX_Job_%s_User.log' \ % (STAFRoot,STAF_LOCAL_HOSTNAME,thisChild) destFile = '%s/staf-logs/STAX_Job_%s_User.log' \ destFile = '%s/staf-logs/STAX_Job_%s_User.txt' \ % (LOGS_ROOT,thisChild) </script> <process name="'Saving job user logs.....'">