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

andrug
11.15.2008 a4565cc54b62c0c99ef0dce272ffc11dd02106e8
Display error instead of silent mode and clean the code
2 files modified
34 ■■■■ changed files
opends/tests/system-tests/phases/main_run.xml 20 ●●●●● patch | view | raw | blame | history
opends/tests/system-tests/phases/main_run_lib.xml 14 ●●●● patch | view | raw | blame | history
opends/tests/system-tests/phases/main_run.xml
@@ -275,6 +275,16 @@
                ERR_NUM_TOTAL             = ERR_NUM_TOTAL + ERR_NUM[0]
              </script>
            </sequence>
          <else>
            <sequence>
              <message>
                'ERROR : preConfiguration phase is enabled and file \
                does not exist on %s : %s' % \
                (STAXServiceMachine,preConfigurationFile)
              </message>
              <script>ERR_NUM_TOTAL += 1 </script>
            </sequence>
          </else>
          </if>
        </sequence>
      </if>
@@ -324,6 +334,16 @@
                ERR_NUM_TOTAL              = ERR_NUM_TOTAL + ERR_NUM[0]
              </script>
            </sequence>
          <else>
            <sequence>
              <message>
                'ERROR : postConfiguration phase is enabled and file \
                does not exist on %s : %s' % \
                (STAXServiceMachine,postConfigurationFile)
              </message>
              <script>ERR_NUM_TOTAL += 1 </script>
            </sequence>
          </else>
          </if>
        </sequence>
      </if>
opends/tests/system-tests/phases/main_run_lib.xml
@@ -172,12 +172,9 @@
              'fileFd'     : NO_FILE
            }
          </call>
          <script>
            fullHostName = '%s%s' % (instance.getHost(),DOMAIN[0])
          </script>
          <call function="'copyFolder'">
            {
              'remoteHost'    : fullHostName,
              'remoteHost'    : '%s%s' % (instance.getHost(),DOMAIN[0]),
              'fromDirectory' : '%s/phases/shared/java' % TESTS_DIR,
              'toDirectory'   : '%s/phases/shared/java' % LOCAL_TESTS_DIR,
              'fileFd'        : NO_FILE
@@ -263,13 +260,10 @@
                  }
                </call>
              </if>
              <script>
                fullHostName = '%s%s' % (client.getHost(),DOMAIN[0])
              </script>
              <!-- Copy shared clients -->
              <call function="'copyFolder'">
              {
                'remoteHost'    : fullHostName,
                'remoteHost'    : '%s%s' % (client.getHost(),DOMAIN[0]),
                'fromDirectory' : '%s/clients' % TESTS_DIR,
                'toDirectory'   : '%s/clients' % LOCAL_TESTS_DIR,
                'fileFd'        : NO_FILE
@@ -371,7 +365,7 @@
          {
            'srcFile'    : '%s/cnMonitor.txt' % instance.getLogDir(),
            'destFile'   : '%s/cnMonitor.txt' % instance.getLogDir(),
            'location'   : instance.getHost(),
            'location'   : '%s%s' % (instance.getHost(),DOMAIN[0]),
            'remoteHost' : STAXServiceMachine,
            'fileFd'     : NO_FILE
          }
@@ -382,7 +376,7 @@
          {
            'srcFile'    : '%s/config/config.ldif' % instance.getInstallDir(),
            'destFile'   : '%s/config.ldif' % instance.getLogDir(),
            'location'   : instance.getHost(),
            'location'   : '%s%s' % (instance.getHost(),DOMAIN[0]),
            'remoteHost' : STAXServiceMachine,
            'fileFd'     : NO_FILE
          }