[freenet-cvs] r17788 - trunk/freenet/src/freenet/node/simulator

[t...@freenetproject.org]

Author: toad
Date: 2008-02-11 19:59:18 +0000 (Mon, 11 Feb 2008)
New Revision: 17788

Modified:
   trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
   trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
Log:
ping test: Pass in sleep time rather than hardcoding it

Modified: 
trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-02-11 19:57:34 UTC (rev 17787)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRequestInsertTest.java     
2008-02-11 19:59:18 UTC (rev 17788)
@@ -70,7 +70,7 @@

         waitForAllConnected(nodes);

-        waitForPingAverage(0.95, nodes, random, MAX_PINGS);
+        waitForPingAverage(0.95, nodes, random, MAX_PINGS, 5000);

         System.out.println();
         System.out.println("Ping average > 95%, lets do some 
inserts/requests");

Modified: trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-02-11 19:57:34 UTC (rev 17787)
+++ trunk/freenet/src/freenet/node/simulator/RealNodeRoutingTest.java   
2008-02-11 19:59:18 UTC (rev 17788)
@@ -71,11 +71,11 @@

         waitForAllConnected(nodes);

-        waitForPingAverage(0.98, nodes, random, MAX_PINGS);
+        waitForPingAverage(0.98, nodes, random, MAX_PINGS, 5000);

     }

-       static void waitForPingAverage(double accuracy, Node[] nodes, 
RandomSource random, int maxTests) {
+       static void waitForPingAverage(double accuracy, Node[] nodes, 
RandomSource random, int maxTests, int sleepTime) {
         int cycleNumber = 0;
         int lastSwaps = 0;
         int lastNoSwaps = 0;
@@ -87,7 +87,7 @@
         for(int total=0;total<maxTests;total++) {
             cycleNumber++;
             try {
-                Thread.sleep(5000);
+                Thread.sleep(sleepTime);
             } catch (InterruptedException e) {
                 // Ignore
             }