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 km...@apache.org on 2010/03/04 20:58:01 UTC
svn commit: r919148 - in /db/derby/code/branches/10.5: ./
java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
Author: kmarsden
Date: Thu Mar 4 19:58:01 2010
New Revision: 919148
URL: http://svn.apache.org/viewvc?rev=919148&view=rev
Log:
DERBY-4564 Replication tests do not pick up derby.tests.networkServerStartTimeout
Modified:
db/derby/code/branches/10.5/ (props changed)
db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 4 19:58:01 2010
@@ -1 +1 @@
-/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,911315,915733,916075
+/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,829022,832379,833430,835286,881074,881444,882732,884163,887246,892912,897161,901165,901648,901760,903108,911315,915733,916075,916897
Modified: db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java?rev=919148&r1=919147&r2=919148&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java (original)
+++ db/derby/code/branches/10.5/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/ReplicationRun.java Thu Mar 4 19:58:01 2010
@@ -129,6 +129,8 @@
static String LF = null;
static final String remoteShell = "/usr/bin/ssh -x"; // or /usr/bin/ssh ?
+
+ private static final long DEFAULT_SERVER_START_TIMEOUT = 75000;
Utils util = new Utils();
@@ -2448,9 +2450,14 @@
}
}
);
+ // DERBY-4564. Make replication tests use derby.tests.networkServerTimeout proeprty
+ String userStartTimeout = getSystemProperty("derby.tests.networkServerStartTimeout");
+ long startTimeout = (userStartTimeout != null )?
+ Long.parseLong(userStartTimeout): DEFAULT_SERVER_START_TIMEOUT;
+ long iterations = startTimeout / PINGSERVER_SLEEP_TIME_MILLIS;
util.DEBUG(debugId+"************** Do .start().");
serverThread.start();
- pingServer(serverHost, serverPort, 150); // Wait for the server to come up in a reasonable time....
+ pingServer(serverHost, serverPort, (int) iterations); // Wait for the server to come up in a reasonable time....
}
@@ -2800,8 +2807,7 @@
+ iterations + " * " + PINGSERVER_SLEEP_TIME_MILLIS + "ms.: "
+ finalException.getMessage();
util.DEBUG( msg );
- finalException.printStackTrace(); // REMOVE?
- throw new Exception(msg);
+ throw finalException;
}