[jboss-cvs] JBossAS SVN: r109805 - in branches/JBoss-AS-6.0.x-ipv6/testsuite: src/main/org/jboss/test/cluster/defaultcfg/test and 1 other directory.

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

Author: rachmatowicz at jboss.com
Date: 2010-12-08 17:02:30 -0500 (Wed, 08 Dec 2010)
New Revision: 109805

Modified:
   branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
   branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java
Log:
Fix up JChannelFactoryClasslLoaderLeakTestCase to use stack specific multicast address (JBAS-8540)

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml	2010-12-08 21:39:49 UTC (rev 109804)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/build.xml	2010-12-08 22:02:30 UTC (rev 109805)
@@ -207,6 +207,15 @@
 	  </and>	
 	</condition>	
 	
+	<!-- this mcast address is used by JChannelFactoryClassLoaderLeakTestCase and must vary depending on IP stack -->
+	<!-- JBAS-8540 -->
+	<condition property="jbosstest.jgroups.mcast_addr" value="230.111.111.111" else="ff0e::111:111:111">
+	  <and>
+ 	    <isset property="java.net.preferIPv4Stack"/>
+ 	    <istrue value="${java.net.preferIPv4Stack}"/>
+	  </and>	
+	</condition>	
+	
    <!-- =================== -->
    <!-- Basic Configuration -->
    <!-- =================== -->

Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java	2010-12-08 21:39:49 UTC (rev 109804)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/JChannelFactoryClassLoaderLeakTestCase.java	2010-12-08 22:02:30 UTC (rev 109805)
@@ -146,12 +146,21 @@
       
       testLoader = new ClassLoader(Thread.currentThread().getContextClassLoader()){};
       
+      // set the jgroups.bind_addr to the testsuite bind_addr
       String jgroups_bind_addr = System.getProperty("jgroups.bind_addr");
       if (jgroups_bind_addr == null)
       {
-         System.setProperty("jbosstest.cluster.node0", System.getProperty("jbosstest.cluster.node0", "localhost"));
+         System.setProperty("jgroups.bind_addr", System.getProperty("jbosstest.cluster.node0", "localhost"));
       }
+
+      // JBAS-8540 need to use a stack specific default for JGroups mcast address
+      String jgroups_udp_mcast_addr = System.getProperty("jgroups.udp.mcast_addr");
+      if (jgroups_udp_mcast_addr == null)
+      {
+         System.setProperty("jgroups.udp.mcast_addr", System.getProperty("jbosstest.jgroups.mcast_addr", "230.111.111.111"));
+      }
       
+      
       factory1 = new TestClassLoaderJChannelFactory();
       factory1.setMultiplexerConfig("cluster/channelfactory/stacks.xml");
       factory1.setAssignLogicalAddresses(false);