[jboss-cvs] JBossAS SVN: r92271 - in branches/JBPAPP_5_0/testsuite: src/main/org/jboss/test/crashrecovery/ASCrashRecovery01 and 1 other directories.

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

Author: istudens at redhat.com
Date: 2009-08-12 10:46:07 -0400 (Wed, 12 Aug 2009)
New Revision: 92271

Modified:
   branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/TestWithJPA.java
   branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml
Log:
timeout for crash recovery tests is now configurable from command line, JBPAPP-2471

Modified: branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml	2009-08-12 14:36:56 UTC (rev 92270)
+++ branches/JBPAPP_5_0/testsuite/imports/config/tests-crash-recovery.xml	2009-08-12 14:46:07 UTC (rev 92271)
@@ -37,6 +37,7 @@
       <antcall target="prepare-crashrec-profiles" />
    	
    	  <property name="crash.target" value="crash-tests" />
+ 	  <property name="crash.max.time" value="300000" />
    	
       <run-as-test target="${crash.target}" />
 
@@ -79,6 +80,7 @@
             <sysproperty key="crash.tstype" value="${crash.tstype}" />
             <sysproperty key="crash.tsdemarc" value="${crash.tsdemarc}" />
             <sysproperty key="crash.testcase" value="${crash.testcase}" />
+            <sysproperty key="testTime" value="${crash.max.time}" />
             <env key="JBOSS_HOME" value="${jbosstest.dist}" />
             <!--arg value="-verbose"/-->
          	<arg value="-f"/>

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/TestWithJPA.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/TestWithJPA.java	2009-08-12 14:36:56 UTC (rev 92270)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/TestWithJPA.java	2009-08-12 14:46:07 UTC (rev 92271)
@@ -109,7 +109,7 @@
          else if ("storeImple".equals(key))
             storeImple = val;
          else if ("testTime".equals(key))
-            maxTestTime = parseInt(val, "parameter testTime should represent a number of seconds: ");
+            maxTestTime = parseInt(val, "parameter testTime should represent a number of miliseconds: ");
          else if ("specs".equals(key))
             fspecs = parseSpecs(val, sb);
          else if ("wait".equals(key))

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	2009-08-12 14:36:56 UTC (rev 92270)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml	2009-08-12 14:46:07 UTC (rev 92271)
@@ -404,7 +404,7 @@
         <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}" />
@@ -423,6 +423,7 @@
         <param key="wipeOutTxsInDoubt" value="${wipeOutTxsInDoubt}" />
         <param key="debug" value="true" />
         <param key="reportFile" value="${build.reports}/TEST-org.jboss.test.crashrecovery.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}" />