svn commit: r439702 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java

[mi...@apache.org]

Author: mikem
Date: Sat Sep  2 19:28:35 2006
New Revision: 439702

URL: http://svn.apache.org/viewvc?rev=439702&view=rev
Log:
DERBY-1810

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/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java?rev=439702&r1=439701&r2=439702&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testProperties.java Sat Sep  2 19:28:35 2006
@@ -223,8 +223,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) {
                     }
 				}
@@ -266,7 +269,7 @@
 			propFile.close();
 			//test start no parameters - Pickup 1528 from derby.properties
 			derbyServerCmd("start",null);	
-			waitForStart("1528",15000);
+			waitForStart("1528",60000);
 			System.out.println("Successfully Connected");
 			//shutdown - also picks up from derby.properties
 			derbyServerCmd("shutdown",null);
@@ -274,13 +277,13 @@
 			//test start with system property. Overrides derby.properties
 			derbyServerCmd("start","-Dderby.drda.portNumber=1529");
 
-			waitForStart("1529",15000);	
+			waitForStart("1529",60000);	
 			System.out.println("Successfully Connected");
 			//shutdown - also picks up from System Properties
 			derbyServerCmd("shutdown","1529");
 			System.out.println("Testing command line option. Port 1530");
 			derbyServerCmd("start","1530");
-			waitForStart("1530",15000);		
+			waitForStart("1530",60000);		
 			System.out.println("Successfully Connected");
 			//shutdown - with command line option
 			derbyServerCmd("shutdown","1530");
@@ -294,7 +297,7 @@
 			//Shutdown the server started by test
 			derbyServerCmd("shutdown","1527");
             execCmdDumpResults(startServerCmd, false);
-			waitForStart("1527",15000);
+			waitForStart("1527",60000);
 			//check that default properties are used
 			listProperties("1527");