Fix tasks/restore_db testcases + other minor fixes

Christophe Sovant

22.12.2009 7cefcb4965067109d0a1a98a3f3fd71b139d61f0

Fix tasks/restore_db testcases + other minor fixes

 opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml

@@ -139,7 +139,7 @@
              <call function="'addSTAFJavaService'" >
                {
                'location'    : STAXServiceMachine,
                'serviceName' : 'Dsml',
                'serviceName' : 'dsml',
                'serviceJar'  : '%s/dsml/dsmlService.jar' % local.java,
                'J2'          : '-Xms128m -Xmx512m'
                }

 opends/tests/staf-tests/functional-tests/testcases/tasks/restore_db.xml

@@ -207,7 +207,7 @@
                import java.text.SimpleDateFormat
  
                cal = java.util.Calendar.getInstance()
                cal.add(java.util.Calendar.SECOND,10)
                cal.add(java.util.Calendar.SECOND,30)
  
                dateFormat = java.text.SimpleDateFormat("yyyyMMddHHmmss")
  
@@ -298,12 +298,6 @@
                'expectedResult'       : '1' }
              </call>
  
              <call function="'searchStringForSubstring'">
                { 'returnString'       : returnString,
                'testString'       : 'Waiting on start time',
                'expectedResult'       : '1' }
              </call>
  
              <call function="'Sleep'">
                { 'sleepForMilliSeconds'  :  120000 }
              </call>

 opends/tests/staf-tests/shared/ant/build.properties

@@ -89,7 +89,7 @@

# Tests section
tests.default=true
tests.tmp.dir=${logs.dir}/${tests.type}/run
tests.tmp.dir=${logs.dir}/${tests.type}/tmp
tests.dir=${basedir}/${tests.type}
tests.shared.dir=${shared.dir}/tests
tests.config.stubs=${tests.shared.dir}/config.py.stubs

 opends/tests/staf-tests/shared/ant/build.xml

@@ -228,7 +228,6 @@
    <var name="archives.dir" value="${repository.dir}/archives"/>
    <var name="tests.run.dir" value="${logs.dir}/${tests.type}/run"/>

<echo>${tests.tmp.dir}</echo>
    <if>
      <equals arg1="${os.family}" arg2="windows"/>
      <then>

 opends/tests/staf-tests/shared/staf/staf-controller.cfg

@@ -51,7 +51,7 @@
  OPTION JVMNAME=stafJVM-${local.hostname}  \
  OPTION J2=-Xms1g -Xmx1g \
    -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled \
    -XX:+CMSPermGenSweepingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m \
    -XX:+CMSClassUnloadingEnabled -XX:NewSize=500m -XX:MaxNewSize=500m \
    -XX:SurvivorRatio=6 -XX:PermSize=256m -XX:MaxPermSize=256m -Xoss2m -Xss2m \
  OPTION JVM=${local.javahome}/bin/java \
  PARMS "PYTHONOUTPUT JobUserLogAndMsg" "PYTHONLOGLEVEL Info"