Author: cutting
Date: Mon Jan 2 14:33:38 2006
New Revision: 365454
URL: http://svn.apache.org/viewcvs?rev=365454&view=rev
Log:
Revert unintended commit.
Modified:
lucene/nutch/trunk/src/test/org/apache/nutch/ipc/TestIPC.java
Modified: lucene/nutch/trunk/src/test/org/apache/nutch/ipc/TestIPC.java
URL:
http://svn.apache.org/viewcvs/lucene/nutch/trunk/src/test/org/apache/nutch/ipc/TestIPC.java?rev=365454&r1=365453&r2=365454&view=diff
==============================================================================
--- lucene/nutch/trunk/src/test/org/apache/nutch/ipc/TestIPC.java (original)
+++ lucene/nutch/trunk/src/test/org/apache/nutch/ipc/TestIPC.java Mon Jan 2
14:33:38 2006
@@ -35,8 +35,6 @@
public static final Logger LOG =
LogFormatter.getLogger("org.apache.nutch.ipc.TestIPC");
- private static final int TIMEOUT = 10000;
-
// quiet during testing, since output ends up on console
static {
LOG.setLevel(Level.WARNING);
@@ -44,6 +42,8 @@
Server.LOG.setLevel(Level.WARNING);
}
+ public TestIPC(String name) { super(name); }
+
private static final Random RANDOM = new Random();
private static final int PORT = 1234;
@@ -53,7 +53,7 @@
public TestServer(int port, int handlerCount, boolean sleep) {
super(port, LongWritable.class, handlerCount);
- this.setTimeout(TIMEOUT);
+ this.setTimeout(1000);
this.sleep = sleep;
}
@@ -75,7 +75,7 @@
public SerialCaller(Client client, int count) {
this.client = client;
this.count = count;
- client.setTimeout(TIMEOUT);
+ client.setTimeout(1000);
}
public void run() {
@@ -108,7 +108,7 @@
this.client = client;
this.addresses = addresses;
this.count = count;
- client.setTimeout(TIMEOUT);
+ client.setTimeout(1000);
}
public void run() {
@@ -157,10 +157,10 @@
callers[i].join();
assertFalse(callers[i].failed);
}
-// for (int i = 0; i < clientCount; i++) {
-// clients[i].stop();
-// }
-// server.stop();
+ for (int i = 0; i < clientCount; i++) {
+ clients[i].stop();
+ }
+ server.stop();
}
public void testParallel() throws Exception {
@@ -207,17 +207,14 @@
public static void main(String[] args) throws Exception {
// crank up the volume!
-// LOG.setLevel(Level.INFO);
-// Client.LOG.setLevel(Level.INFO);
-// Server.LOG.setLevel(Level.INFO);
-// LogFormatter.setShowThreadIDs(true);
-
- new TestIPC().testSerial(10, false, 500, 500, 100);
- //new TestIPC().testParallel(10, false, 2, 4, 2, 4, 1000);
-
-// TestIPC test = new TestIPC();
-// test.testSerial();
-// test.testParallel();
+ LOG.setLevel(Level.FINE);
+ Client.LOG.setLevel(Level.FINE);
+ Server.LOG.setLevel(Level.FINE);
+ LogFormatter.setShowThreadIDs(true);
+
+ //new TestIPC("test").testSerial(5, false, 2, 10, 1000);
+
+ new TestIPC("test").testParallel(10, false, 2, 4, 2, 4, 1000);
}