mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

madiot
16.48.2009 88b6b0c8403e014ecfc0c0379dd6f2bdd472df4a
tomcat-6.0.20 startup.bat return code now is consistent with unix
make the backup of tomcat logs from remote to controler host
2 files modified
14 ■■■■ changed files
opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/shared/functions/webcontainer.xml 10 ●●●● patch | view | raw | blame | history
opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_cleanup.xml
@@ -117,10 +117,10 @@
            <message>'getting the list of generic known Issues spanning multiple tests'</message>
            <call function="'runSTAFCommand'">
              { 'name'      :  'backup tomcat log files',
                'location'  :  STAXServiceMachine,
                'location'  :  STAF_REMOTE_HOSTNAME,
                'service'   :  'FS',
                'request'   :  'COPY ',
                'arguments' :  'DIRECTORY %s/%s-%s/logs TODIRECTORY %s/tomcatLogBackup RECURSE' % (WC_DIRECTORY, WC_TYPE, WC_VERSION, local.temp)
                'arguments' :  'DIRECTORY %s/%s-%s/logs TODIRECTORY %s/tomcatLogBackup TOMACHINE %s RECURSE' % (WC_DIRECTORY, WC_TYPE, WC_VERSION, STAXServiceMachine, local.temp)
              }
            </call>
opends/tests/staf-tests/shared/functions/webcontainer.xml
@@ -329,21 +329,13 @@
        '%s' % STAFCmd
      </message>
      <!-- On Windows systems, startup command always returns 1 -->
      <script>
        if is_windows_platform(location):
          expectedRC=1
        else:
          expectedRC=0
      </script>
      <call function="'runCommand'">
        { 'location' : location,
        'command'    : STAFCmd,
        'envCmd'     : STAFCmdEnv,
        'name'       : STAFCmd,
        'path'       : wcBinPath,
        'expectedRC' : expectedRC
        'expectedRC' : 0
        }
      </call>