[jboss-cvs] JBossAS SVN: r103258 - in branches/JBPAPP_5_0/testsuite: src/resources/crashrecovery/scripts and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: istudens at redhat.com
Date: 2010-03-30 08:55:59 -0400 (Tue, 30 Mar 2010)
New Revision: 103258

Modified:
   branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml
   branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml
Log:
fix stop-server for crashrec tests and default config for JTA crashrec tests, JBQA-2176

Modified: branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml	2010-03-30 12:46:26 UTC (rev 103257)
+++ branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml	2010-03-30 12:55:59 UTC (rev 103258)
@@ -98,7 +98,7 @@
    
    <target name="prepare-crashrec-profiles" unless="have.profiles">
       <delete dir="${jboss.dist}/server/crashrecovery-jta" />
-      <create-config baseconf="standard" newconf="crashrecovery-jta">
+      <create-config baseconf="default" newconf="crashrecovery-jta">
          <patternset>
             <include name="conf/**"/>
             <include name="deploy/**"/>

Modified: branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml	2010-03-30 12:46:26 UTC (rev 103257)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml	2010-03-30 12:55:59 UTC (rev 103258)
@@ -335,7 +335,7 @@
   </target>
 
 
-  <target name="crash-tests-for-database" depends="hack-before-astest-run, start-appserver-for-crash-tests, crash-tests-for-database-cmt, crash-tests-for-database-bmt, hack-after-astest-run" />
+  <target name="crash-tests-for-database" depends="hack-before-astest-run, start-appserver-for-crash-tests, crash-tests-for-database-cmt, crash-tests-for-database-bmt, stop-appserver-for-crash-tests, hack-after-astest-run" />
 
   <target name="crash-tests-for-database-cmt" if="want.cmt">
     <antcall target="crash-tests-all-testcases"><param name="cmt" value="true" /></antcall>
@@ -418,11 +418,12 @@
   </target>
 
   <target name="stop-appserver-for-crash-tests">
+      <!-- the server cannot be stop here, because of different classloader and server manager instance than in the time of server start-up
       <astest:server method="stop" serverName="crashrecovery-${tstype}" >
         <undeploy from="deploy/${astest.app.jar.name}" />
         <undeploy from="deploy/${datasource}" />
         <undeploy from="lib/${dbdriver}" />    	
-      </astest:server>
+      </astest:server-->
       
       <!-- archive the server log -->
       <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/server-${dbname}.log.zip">