You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by mi...@apache.org on 2006/09/19 21:33:46 UTC
svn commit: r447939 -
/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
Author: mikem
Date: Tue Sep 19 12:33:45 2006
New Revision: 447939
URL: http://svn.apache.org/viewvc?view=rev&rev=447939
Log:
DERBY-1810
backporting change 439702 from trunk to 10.1 codeline.
Bumping the time to wait for server to start in this test. In my environment
this test is failing consistently (and bad error handling in the test then
causes this test to hang forever). Bumping the timeout so far has made it
pass (I tried it 10 times), where before it failed 10 times.
Modified:
db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java?view=diff&rev=447939&r1=447938&r2=447939
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java Tue Sep 19 12:33:45 2006
@@ -180,8 +180,11 @@
try {
currentThread.wait(1000);
waitTime += 1000;
- if (waitTime >= timeToWait)
+ if (waitTime >= timeToWait) {
+ System.out.println(
+ "Giving up on wait, waited: " + waitTime);
throw e;
+ }
} catch (InterruptedException ie) {
}
}
@@ -227,7 +230,7 @@
propFile.close();
//test start no parameters - Pickup 1528 from derby.properties
derbyServerCmd("start",null, bos);
- waitForStart("1528",15000);
+ waitForStart("1528",60000);
System.out.println("Successfully Connected");
//shutdown - also picks up from derby.properties
derbyServerCmd("shutdown",null, shutdownStream);
@@ -235,13 +238,13 @@
//test start with system property. Overrides derby.properties
derbyServerCmd("start","-Dderby.drda.portNumber=1529", bos);
- waitForStart("1529",15000);
+ waitForStart("1529",60000);
System.out.println("Successfully Connected");
//shutdown - also picks up from System Properties
derbyServerCmd("shutdown","1529", shutdownStream);
System.out.println("Testing command line option. Port 1530");
derbyServerCmd("start","1530", bos);
- waitForStart("1530",15000);
+ waitForStart("1530",60000);
System.out.println("Successfully Connected");
//shutdown - with command line option
derbyServerCmd("shutdown","1530", shutdownStream);
@@ -255,7 +258,7 @@
//Shutdown the server started by test
derbyServerCmd("shutdown","1527", shutdownStream);
execCmd(startServerCmd);
- waitForStart("1527",15000);
+ waitForStart("1527",60000);
//check that default properties are used
listProperties("1527");
System.out.println("Successfully Connected");