Temporary fix to avoid remaning processes when some testcases fail in setup...

Christophe Sovant

11.59.2008 82a7ae09fba7c6eab0422bfaaad73e2ee77cdf4a

Temporary fix to avoid remaning processes when some testcases fail in setup testsuite

 opendj-sdk/opends/tests/functional-tests/testcases/setup/ports.xml

@@ -375,6 +375,27 @@
            }
          </call>

          <!--- Temporary fix to avoid remaning processes
                when this testcase fails -->
          <script>
            cmd = '%s/%s/%s/stop-ds%s' \
                  % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
          </script>
          <if expr="os.path.exists(cmd)" >
            <sequence>
              <message>'Stop instance'</message>
              <call function="'StopDsWithScript'">
                { 'location'  : STAF_REMOTE_HOSTNAME,
                'dsPath'      : '%s/%s' % (ODS_UNZIPPED, OPENDSNAME),
                'dsPort'      : 1,
                'dsBindDN'    : 'cn=Directory Manager' ,
                'dsBindPwd'   : 'kangourou' ,
                'expectedRC'  : 'noCheck'
                }
              </call>
            </sequence>
          </if>

          <call function="'testCase_Postamble'"/>
        </sequence>
      </testcase> 

 opendj-sdk/opends/tests/functional-tests/testcases/setup/security.xml

@@ -882,6 +882,27 @@
            }
          </call>

          <!--- Temporary fix to avoid remaning processes
                when this testcase fails -->
          <script>
            cmd = '%s/%s/%s/stop-ds%s' \
            % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
          </script>
          <if expr="os.path.exists(cmd)" >
            <sequence>
              <message>'Stop I1'</message>
              <call function="'StopDsWithScript'">
                { 'location'  : STAF_REMOTE_HOSTNAME,
                'dsPath'      : SEC_I1_ROOT,
                'dsPort'      : SEC_I1_PORT,
                'dsBindDN'    : DM_DN ,
                'dsBindPwd'   : DM_PW ,
                'expectedRC'  : 'noCheck'
                }
              </call>
            </sequence>
          </if>

          <!-- 6.3. Uninstall I2 -->
          <message>'++ Uninstall I2'</message> 
          <script>
@@ -906,6 +927,27 @@
            }
          </call>

          <!--- Temporary fix to avoid remaning processes
                when this testcase fails -->
          <script>
            cmd = '%s/%s/%s/stop-ds%s' \
            % (ODS_UNZIPPED, OPENDSNAME, fileFolder, fileExt)
          </script>
          <if expr="os.path.exists(cmd)" >
            <sequence>
              <message>'Stop I2'</message>
              <call function="'StopDsWithScript'">
                { 'location'  : STAF_REMOTE_HOSTNAME,
                'dsPath'      : SEC_I2_ROOT,
                'dsPort'      : SEC_I2_PORT,
                'dsBindDN'    : DM_DN ,
                'dsBindPwd'   : DM_PW ,
                'expectedRC'  : 'noCheck'
                }
              </call>
            </sequence>
          </if>

          <call function="'testCase_Postamble'"/>

        </sequence>