[jboss-cvs] JBossAS SVN: r91761 - 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: 2009-07-29 02:27:26 -0400 (Wed, 29 Jul 2009)
New Revision: 91761

Modified:
   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:
database name added to the archive names, JBQA-2176

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-07-29 05:24:18 UTC (rev 91760)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/crashrecovery/ASCrashRecovery01/TestWithJPA.java	2009-07-29 06:27:26 UTC (rev 91761)
@@ -181,7 +181,7 @@
          
          Set<RecoveredXid> xidsInDoubtAfterTest = lookupCrashHelper().checkXidsInDoubt();
          if (isDebug)
-            print(xidsInDoubt.size() + " txs in doubt in database after test run");
+            print(xidsInDoubtAfterTest.size() + " txs in doubt in database after test run");
          if (xidsInDoubt.size() != xidsInDoubtAfterTest.size()) 
          {
             print((xidsInDoubtAfterTest.size() - xidsInDoubt.size()) + " new txs in doubt in database after this test run");

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-07-29 05:24:18 UTC (rev 91760)
+++ branches/JBPAPP_5_0/testsuite/src/resources/crashrecovery/scripts/as-tests.xml	2009-07-29 06:27:26 UTC (rev 91761)
@@ -304,11 +304,11 @@
       </astest:server>
       
       <!-- archive the server log -->
-      <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/server-${specs}-${test.name.cmt}${test.name.reverseOrder}.log.zip">
+      <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/server-${dbname}-${testname}.log.zip">
    	    <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
    	  </zip>
       <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
-      <copy todir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store-${specs}-${test.name.cmt}${test.name.reverseOrder}"> 
+      <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"/>