[infinispan-commits] Infinispan SVN: r438 - in trunk/core/src/test: resources/stacks and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-06-11 11:10:58 -0400 (Thu, 11 Jun 2009)
New Revision: 438

Modified:
   trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
   trunk/core/src/test/resources/stacks/tcp.xml
Log:
[ISPN-98] - (Switch test suite to use MPING instead of TCPPING for the tcp stack) - implemented

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java	2009-06-11 09:22:03 UTC (rev 437)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java	2009-06-11 15:10:58 UTC (rev 438)
@@ -83,6 +83,15 @@
 
    public static String getTcpConfig() {
       loadTcp();
+
+      if (tcpConfig.contains("TCPPING")) {
+         return getTcpConfigWithTCPPINGDiscoevry();
+      } else {
+         return replaceMCastAddressAndPort(tcpConfig);
+      }
+   }
+
+   private static String getTcpConfigWithTCPPINGDiscoevry() {
       // replace mcast_addr
       Matcher m = TCP_START_PORT.matcher(tcpConfig);
       String result;
@@ -109,7 +118,12 @@
    public static String getUdpConfig() {
       loadUdp();
       // replace mcast_addr
-      Matcher m = UDP_MCAST_ADDRESS.matcher(udpConfig);
+      String config = udpConfig;
+      return replaceMCastAddressAndPort(config);
+   }
+
+   private static String replaceMCastAddressAndPort(String config) {
+      Matcher m = UDP_MCAST_ADDRESS.matcher(config);
       String result;
       if (m.find()) {
          String newAddr = threadMcastIP.get();

Modified: trunk/core/src/test/resources/stacks/tcp.xml
===================================================================
--- trunk/core/src/test/resources/stacks/tcp.xml	2009-06-11 09:22:03 UTC (rev 437)
+++ trunk/core/src/test/resources/stacks/tcp.xml	2009-06-11 15:10:58 UTC (rev 438)
@@ -30,10 +30,15 @@
          oob_thread_pool.queue_max_size="100"
          oob_thread_pool.rejection_policy="run"/>
          
-    <TCPPING timeout="3000"
-             initial_hosts="localhost[7800],localhost[7801]}"
-             port_range="1"
-             num_initial_members="3"/>
+    <!--<TCPPING timeout="3000"-->
+             <!--initial_hosts="localhost[7800],localhost[7801]}"-->
+             <!--port_range="1"-->
+             <!--num_initial_members="3"/>-->
+
+   <MPING bind_addr="127.0.0.1" break_on_coord_rsp="true"
+          mcast_addr="230.8.8.8" mcast_port="17890" ip_ttl="2"
+          num_initial_members="3"/>
+   
     <MERGE2 max_interval="30000"
               min_interval="10000"/>
     <FD_SOCK/>