[jboss-cvs] JBossAS SVN: r109298 - in branches/6.0.0.20101110-CR1: testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test and 1 other directory.

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

Author: pferraro
Date: 2010-11-12 10:28:56 -0500 (Fri, 12 Nov 2010)
New Revision: 109298

Modified:
   branches/6.0.0.20101110-CR1/cluster/src/resources/infinispan/infinispan-configs.xml
   branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
Log:
Merge clustering testsuites fixes from trunk

Modified: branches/6.0.0.20101110-CR1/cluster/src/resources/infinispan/infinispan-configs.xml
===================================================================
--- branches/6.0.0.20101110-CR1/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-12 14:27:35 UTC (rev 109297)
+++ branches/6.0.0.20101110-CR1/cluster/src/resources/infinispan/infinispan-configs.xml	2010-11-12 15:28:56 UTC (rev 109298)
@@ -73,7 +73,7 @@
           <hash numOwners="2"/>
         </clustering>
         <loaders passivation="true">
-          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false">
+          <loader class="org.infinispan.loaders.file.FileCacheStore" fetchPersistentState="false" purgeOnStartup="true">
             <properties>
               <property name="location" value="${jboss.server.data.dir}${/}web"/>
             </properties>

Modified: branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java
===================================================================
--- branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java	2010-11-12 14:27:35 UTC (rev 109297)
+++ branches/6.0.0.20101110-CR1/testsuite/src/main/org/jboss/test/cluster/defaultcfg/web/test/SessionPassivationTestCase.java	2010-11-12 15:28:56 UTC (rev 109298)
@@ -225,14 +225,6 @@
        deployed1 = false;
        undeploy(adaptors[1]);
        
-       if (!isCleanCacheOnRedeploy())
-       {
-          // Make sure the cache is not stopped during redeploy due to
-          // no services using it. Tell CacheHelper to hold a ref.
-//          String cacheConfigName = System.getProperty(SessionTestUtil.CACHE_CONFIG_PROP, "standard-session-cache");
-//          SessionTestUtil.setCacheConfigName(adaptors[0], cacheConfigName);
-       }
-       
        sleep(2000);
           
        // Create an instance of HttpClient.
@@ -259,16 +251,8 @@
        // Get the Attribute using the same session ID
        SessionTestUtil.setCookieDomainToThisServer(client, servers_[0]);
        
-       if (isCleanCacheOnRedeploy())
-       {
-          // We don't expect data to survive a restart
-          makeGetFailed(client, baseURL0_ +getUrl);
-       }
-       else
-       {                 
-          String attr0 = makeGet(client, baseURL0_ +getUrl);          
-          assertEquals("attributeMatches after activation", attr0, attr);
-       }
+       // We don't expect data to survive a restart
+       makeGetFailed(client, baseURL0_ +getUrl);
        
        getLog().debug("Exit testRedeploy");