db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1379230 - in /db/derby/code/branches/10.8: ./ java/client/org/apache/derby/client/net/NetCursor.java java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
Date Thu, 30 Aug 2012 23:41:44 GMT
Author: myrnavl
Date: Thu Aug 30 23:41:44 2012
New Revision: 1379230

URL: http://svn.apache.org/viewvc?rev=1379230&view=rev
Log:
DERBY-5912; testIsValidImplemented fails for NetworkServer in some slow running machines/configurations
  backport revision 1379219 from 10.9.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java   (props
changed)
    db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/branches/10.9:r1379219
  Merged /db/derby/code/trunk:r1379163

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
  Merged /db/derby/code/branches/10.9/java/client/org/apache/derby/client/net/NetCursor.java:r1379219

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java?rev=1379230&r1=1379229&r2=1379230&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
(original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ConnectionTest.java
Thu Aug 30 23:41:44 2012
@@ -164,8 +164,10 @@ public class ConnectionTest
         // Test with an infinite (0) timeout
         assertTrue(getConnection().isValid(0));
 
-        // Test with a 1 second timeout
-        assertTrue(getConnection().isValid(1));
+        // Test with a large timeout. We expect
+        // to complete and succeed much sooner.
+        // see DERBY-5912
+        assertTrue(getConnection().isValid(200));
 
         // Test with an illegal timeout
         try {



Mime
View raw message