[jboss-cvs] JBossAS SVN: r103337 - trunk/testsuite/src/resources/jbossts/scripts.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 31 10:31:17 EDT 2010
Author: istudens at redhat.com
Date: 2010-03-31 10:31:17 -0400 (Wed, 31 Mar 2010)
New Revision: 103337
Modified:
trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
revert back the refactoring for run all testcases in single AS instance, it could be a problem for later object stores, JBAS-7219
Modified: trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-03-31 14:25:26 UTC (rev 103336)
+++ trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-03-31 14:31:17 UTC (rev 103337)
@@ -324,8 +324,9 @@
</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, stop-appserver-for-crash-tests, hack-after-astest-run" />
+ <target name="crash-tests-for-database" depends="crash-tests-for-database-cmt, crash-tests-for-database-bmt" />
+
<target name="crash-tests-for-database-cmt" if="want.cmt">
<antcall target="crash-tests-all-testcases"><param name="cmt" value="true" /></antcall>
</target>
@@ -345,91 +346,56 @@
testcase-commit_halt-rev" />
<target name="testcase-none" if="want.none">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="none"/><param name="reverseOrder" value="false"/><param name="rollbackExpected" value="false"/>
</antcall>
</target>
<target name="testcase-none-rev" if="want.none.rev">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="none"/><param name="reverseOrder" value="true"/><param name="rollbackExpected" value="false"/>
</antcall>
</target>
<target name="testcase-prepare_ex" if="want.prepare_ex">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="prepare_ex"/><param name="reverseOrder" value="false"/><param name="rollbackExpected" value="true"/>
</antcall>
</target>
<target name="testcase-prepare_ex-rev" if="want.prepare_ex.rev">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="prepare_ex"/><param name="reverseOrder" value="true"/><param name="rollbackExpected" value="true"/>
</antcall>
</target>
<target name="testcase-prepare_halt" if="want.prepare_halt">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="prepare_halt"/><param name="reverseOrder" value="false"/><param name="rollbackExpected" value="true"/>
</antcall>
</target>
<target name="testcase-prepare_halt-rev" if="want.prepare_halt.rev">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="prepare_halt"/><param name="reverseOrder" value="true"/><param name="rollbackExpected" value="true"/>
</antcall>
</target>
<target name="testcase-commit_halt-rev" if="want.commit_halt.rev">
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="commit_halt"/><param name="reverseOrder" value="true"/><param name="rollbackExpected" value="false"/>
</antcall>
</target>
<target name="testcase-commit_halt" if="want.commit_halt">
<!-- DISABLED test-case: this test scenario is invalid for the current version of JBossTS -->
- <antcall target="crash-recovery-test">
+ <antcall target="execute-crash-recovery-test">
<param name="specs" value="commit_halt"/><param name="reverseOrder" value="false"/><param name="rollbackExpected" value="false"/>
</antcall>
</target>
- <target name="start-appserver-for-crash-tests">
- <condition property="astest.app.jar.name" value="${astest.alternative.jar.name}">
- <isset property="astest.alternative.jar.name"/>
- </condition>
- <property name="astest.app.jar.name" value="${astest.jar.name}" />
+ <target name="execute-crash-recovery-test" depends="hack-before-astest-run, crash-recovery-test, hack-after-astest-run" />
- <astest:server method="start" serverName="crashrecovery-${tstype}" >
- <deploy from="dbdrivers/${dbdriver}" to="lib/${dbdriver}" />
- <deploy from="resources/${datasource}" to="deploy/${datasource}" />
- <deploy from="${astest.jar.deploy.dir}/${astest.app.jar.name}" to="deploy/${astest.app.jar.name}" />
- </astest:server>
- </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-->
-
- <!-- archive the server log -->
- <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/server-${dbname}.log.zip">
- <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
- <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
- </zip>
- <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
- <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
- <copy todir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store-${dbname}">
- <fileset dir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store" />
- </copy>
- <delete dir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store"/>
- <!-- delete work and tmp dirs otherwise tests failed due to permgen space - FIXME is this the right way how to ensure that? -->
- <delete dir="${jboss.home}/server/crashrecovery-${tstype}/work"/>
- <delete dir="${jboss.home}/server/crashrecovery-${tstype}/tmp"/>
- </target>
-
<!--
Note: If you want to wipe out txs in doubt before and after test you have to set property 'wipeOutTxsInDoubt' to true.
-->
@@ -452,11 +418,21 @@
</condition>
<property name="testname" value="${tstype}-${specs}-${test.name.cmt}${test.name.reverseOrder}"/>
+ <condition property="astest.app.jar.name" value="${astest.alternative.jar.name}">
+ <isset property="astest.alternative.jar.name"/>
+ </condition>
+ <property name="astest.app.jar.name" value="${astest.jar.name}" />
+
<condition property="storeType" value="StateManager/BasicAction/TwoPhaseCoordinator/ArjunaTransactionImple">
<equals arg1="${tstype}" arg2="jts" />
</condition>
<property name="storeType" value="StateManager/BasicAction/TwoPhaseCoordinator/AtomicAction" />
+ <astest:server method="start" serverName="crashrecovery-${tstype}" >
+ <deploy from="dbdrivers/${dbdriver}" to="lib/${dbdriver}" />
+ <deploy from="resources/${datasource}" to="deploy/${datasource}" />
+ <deploy from="${astest.jar.deploy.dir}/${astest.app.jar.name}" to="deploy/${astest.app.jar.name}" />
+ </astest:server>
<astest:action abortOnFail="false" waitFor="10000" impl="org.jboss.test.jbossts.taskdefs.JUnitClientAction">
<param key="testClass" value="org.jboss.test.jbossts.ASCrashRecovery01.TestWithJPA" />
<param key="name" value="${dbname}-${testname}" />
@@ -472,7 +448,27 @@
<param key="reportFile" value="${build.reports}/TEST-org.jboss.test.jbossts.ASCrashRecovery01.TestWithJPA-${dbname}-${testname}.xml" />
<param key="testTime" value="${testTime}" />
</astest:action>
+ <astest:server method="stop" serverName="crashrecovery-${tstype}" >
+ <undeploy from="deploy/${astest.app.jar.name}" />
+ <undeploy from="deploy/${datasource}" />
+ <undeploy from="lib/${dbdriver}" />
+ </astest:server>
+ <!-- archive the server log -->
+ <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/server-${dbname}-${testname}.log.zip">
+ <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
+ <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
+ </zip>
+ <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
+ <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
+ <copy todir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store-${dbname}-${testname}">
+ <fileset dir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store" />
+ </copy>
+ <delete dir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store"/>
+ <!-- delete work and tmp dirs otherwise tests failed due to permgen space - FIXME is this the right way how to ensure that? -->
+ <delete dir="${jboss.home}/server/crashrecovery-${tstype}/work"/>
+ <delete dir="${jboss.home}/server/crashrecovery-${tstype}/tmp"/>
+
</sequential>
</target>
@@ -674,7 +670,7 @@
dest="${driver.home}/${driver.name.psql_8.2}"/>
</target>
<target name="get.driver.mysql_5.1" unless="have.dbdriver.mysql_5.1" if="want.mysql_5.1">
- <get src="${driver.url}/maven2/mysql/mysql-connector-java/5.1.8/mysql-connector-java-5.1.8.jar"
+ <get src="${driver.url}/maven2/mysql/mysql-connector-java/5.1.12/mysql-connector-java-5.1.12.jar"
dest="${driver.home}/${driver.name.mysql_5.1}"/>
</target>
<target name="get.driver.mysql_5.0" unless="have.dbdriver.mysql_5.0" if="want.mysql_5.0">
More information about the jboss-cvs-commits
mailing list