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

[t...@freenetproject.org]

Author: toad
Date: 2008-08-08 23:19:43 +0000 (Fri, 08 Aug 2008)
New Revision: 21679

Modified:
   trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
Log:
Tester fixes


Modified: trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java
===================================================================
--- trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java 
2008-08-08 22:18:12 UTC (rev 21678)
+++ trunk/freenet/src/freenet/node/simulator/BootstrapPushPullTest.java 
2008-08-08 23:19:43 UTC (rev 21679)
@@ -36,7 +36,7 @@
        public static int EXIT_FETCH_FAILED = 260;

        public static void main(String[] args) throws 
InvalidThresholdException, IOException, NodeInitException, InterruptedException 
{
-        File dir = new File("bootstrap-test");
+        File dir = new File("bootstrap-push-pull-test");
         FileUtil.removeAll(dir);
         RandomSource random = NodeStarter.globalTestInit(dir.getPath(), false, 
Logger.ERROR, "");
         File seednodes = new File("seednodes.fref");
@@ -52,7 +52,7 @@
         // Create one node
         NodeCrypto.DISABLE_GROUP_STRIP = true;
         Executor executor = new PooledExecutor();
-        Node node = NodeStarter.createTestNode(5000, 5001, "bootstrap-test", 
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000, 
5*1024*1024, true, true, true, true, true, true, true, 12*1024, false, true);
+        Node node = NodeStarter.createTestNode(5000, 5001, dir.getPath(), 
true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 1000, 
5*1024*1024, true, true, true, true, true, true, true, 12*1024, false, true);
         //NodeCrypto.DISABLE_GROUP_STRIP = true;
        //Logger.setupStdoutLogging(Logger.MINOR, 
"freenet:NORMAL,freenet.node.NodeDispatcher:MINOR,freenet.node.FNPPacketMangler:MINOR");
        Logger.getChain().setThreshold(Logger.ERROR); // kill logging
@@ -94,7 +94,7 @@
         FileUtil.writeTo(fis, new File(secondInnerDir, "seednodes.fref"));
         fis.close();
         executor = new PooledExecutor();
-        Node secondNode = NodeStarter.createTestNode(5002, 5003, 
"bootstrap-test", true, false, false, Node.DEFAULT_MAX_HTL, 0, random, 
executor, 1000, 5*1024*1024, true, true, true, true, true, true, true, 12*1024, 
false, true);        
+        Node secondNode = NodeStarter.createTestNode(5002, 5003, 
dir.getPath(), true, false, false, Node.DEFAULT_MAX_HTL, 0, random, executor, 
1000, 5*1024*1024, true, true, true, true, true, true, true, 12*1024, false, 
true);        
         secondNode.start(true);
         waitForTenNodes(secondNode);

@@ -110,7 +110,7 @@
                        return;
                }
                long endFetchTime = System.currentTimeMillis();
-               System.out.println("RESULT: Fetch took 
"+(endInsertTime-startInsertTime)+"ms 
("+TimeUtil.formatTime(endInsertTime-startInsertTime)+") of "+uri+" .");
+               System.out.println("RESULT: Fetch took 
"+(endFetchTime-startFetchTime)+"ms 
("+TimeUtil.formatTime(endFetchTime-startFetchTime)+") of "+uri+" .");
                secondNode.park();
                System.exit(0);
        }