[jboss-cvs] JBossAS SVN: r61150 - in branches/Branch_4_2/testsuite/src/main/org/jboss/test: naming/test and 1 other directories.

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

Author: bstansberry at jboss.com
Date: 2007-03-06 14:55:52 -0500 (Tue, 06 Mar 2007)
New Revision: 61150

Modified:
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
   branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
Log:
Use the jgroups.udp.ip_ttl value to set the autodiscovery TTL as well

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java	2007-03-06 19:53:22 UTC (rev 61149)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/cluster/test/HAJndiTestCase.java	2007-03-06 19:55:52 UTC (rev 61150)
@@ -49,6 +49,7 @@
    private static final String NODE0_HAJNDI = System.getProperty("node0.hajndi.url");
    private static final String NODE1_HAJNDI = System.getProperty("node1.hajndi.url");
    private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup");
+   private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
    
    // BINDING KEYS and VALUES
    private static final String LOCAL0_KEY = "org.jboss.test.cluster.test.Local0Key";
@@ -340,7 +341,7 @@
       env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces");
       // Don't let the discovery packet off the test server so we don't
       // get spurious responses from other servers on the network
-      env.put("jnp.discoveryTTL", "1");
+      env.put("jnp.discoveryTTL", DISCOVERY_TTL);
 
       if (autoDisabled)
       {

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2007-03-06 19:53:22 UTC (rev 61149)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/naming/test/SimpleUnitTestCase.java	2007-03-06 19:55:52 UTC (rev 61150)
@@ -41,6 +41,7 @@
  */
 public class SimpleUnitTestCase extends JBossTestCase
 {
+   private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
    private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup", "");
    
    /**
@@ -240,7 +241,7 @@
       env.setProperty("jnp.partitionName", "DefaultPartition");
       // Don't let the discovery packet off the test server so we don't
       // get spurious responses from other servers on the network
-      env.setProperty("jnp.discoveryTTL", "1");
+      env.setProperty("jnp.discoveryTTL", DISCOVERY_TTL);
       if (DISCOVERY_GROUP != null && "".equals(DISCOVERY_GROUP) == false)
       {
          // Server is not listening for discovery on std multicast address
@@ -291,7 +292,7 @@
       env.setProperty("jnp.discoveryPort", "1102");
       // Don't let the discovery packet off the test server so we don't
       // get spurious responses from other servers on the network
-      env.setProperty("jnp.discoveryTTL", "1");
+      env.setProperty("jnp.discoveryTTL", DISCOVERY_TTL);
       if (DISCOVERY_GROUP != null && "".equals(DISCOVERY_GROUP) == false)
       {
          // Server is not listening for discovery on std multicast address

Modified: branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java
===================================================================
--- branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java	2007-03-06 19:53:22 UTC (rev 61149)
+++ branches/Branch_4_2/testsuite/src/main/org/jboss/test/testbeancluster/test/RetryInterceptorUnitTestCase.java	2007-03-06 19:55:52 UTC (rev 61150)
@@ -57,6 +57,7 @@
  */
 public class RetryInterceptorUnitTestCase extends JBossClusteredTestCase
 {   
+   private static final String DISCOVERY_TTL = System.getProperty("jgroups.udp.ip_ttl", "1");
    private static final String DISCOVERY_GROUP = System.getProperty("jbosstest.udpGroup");
    
    private static File customJndiDir = null;
@@ -501,7 +502,7 @@
       customJndiProperties = new File(customJndiDir, "jndi.properties");
       FileOutputStream fos = new FileOutputStream(customJndiProperties);
       OutputStreamWriter writer = new OutputStreamWriter(fos);
-      writer.write("jnp.discoveryTTL=1\n");
+      writer.write("jnp.discoveryTTL=" + DISCOVERY_TTL + "\n");
       if (DISCOVERY_GROUP != null && "".equals(DISCOVERY_GROUP) == false)
       {
          // The server isn't listening on the std multicast address