[jboss-cvs] JBossAS SVN: r103255 - in trunk/testsuite: imports/sections and 2 other directories.

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

Author: istudens at redhat.com
Date: 2010-03-30 08:35:05 -0400 (Tue, 30 Mar 2010)
New Revision: 103255

Modified:
   trunk/testsuite/imports/config/tests-crash-recovery.xml
   trunk/testsuite/imports/sections/jbossts.xml
   trunk/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml
   trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
fix stop-server for crashrec tests and improve packaging of the test jar for them, JBAS-7219

Modified: trunk/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- trunk/testsuite/imports/config/tests-crash-recovery.xml	2010-03-30 12:29:42 UTC (rev 103254)
+++ trunk/testsuite/imports/config/tests-crash-recovery.xml	2010-03-30 12:35:05 UTC (rev 103255)
@@ -103,7 +103,7 @@
    
    <target name="prepare-crashrec-profiles" unless="have.crash.recovery.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: trunk/testsuite/imports/sections/jbossts.xml
===================================================================
--- trunk/testsuite/imports/sections/jbossts.xml	2010-03-30 12:29:42 UTC (rev 103254)
+++ trunk/testsuite/imports/sections/jbossts.xml	2010-03-30 12:35:05 UTC (rev 103255)
@@ -11,7 +11,10 @@
             <include name="java.policy"/>
          </fileset>
          <fileset dir="${build.classes}">
-            <include name="org/jboss/test/jbossts/**/*.class"/>     <!-- FIXME include only classes needed for crash recovery tests -->
+            <include name="org/jboss/test/jbossts/ASCrashRecovery01/*.class"/>
+            <include name="org/jboss/test/jbossts/crash/*.class"/>
+            <include name="org/jboss/test/jbossts/recovery/*.class"/>
+            <include name="org/jboss/test/jbossts/taskdefs/*.class"/>
          </fileset>
       </jar>
    </target>

Modified: trunk/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml	2010-03-30 12:29:42 UTC (rev 103254)
+++ trunk/testsuite/src/resources/jbossts/resources/postgres82-xa-ds.xml	2010-03-30 12:35:05 UTC (rev 103255)
@@ -5,7 +5,6 @@
     <track-connection-by-tx>true</track-connection-by-tx> 
     <xa-datasource-class>org.postgresql.xa.PGXADataSource</xa-datasource-class>
     <xa-datasource-property name="ServerName">vmg01.mw.lab.eng.bos.redhat.com</xa-datasource-property>
-    <!--xa-datasource-property name="ServerName">dev01.qa.atl.jboss.com</xa-datasource-property-->
     <xa-datasource-property name="PortNumber">5432</xa-datasource-property>
     <xa-datasource-property name="DatabaseName">crashrec</xa-datasource-property>
     <xa-datasource-property name="User">crashrec</xa-datasource-property>

Modified: trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-03-30 12:29:42 UTC (rev 103254)
+++ trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml	2010-03-30 12:35:05 UTC (rev 103255)
@@ -324,7 +324,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>
@@ -407,11 +407,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">