db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1071640 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
Date Thu, 17 Feb 2011 15:21:48 GMT
Author: myrnavl
Date: Thu Feb 17 15:21:46 2011
New Revision: 1071640

URL: http://svn.apache.org/viewvc?rev=1071640&view=rev
Log:
DERBY-4463; JMX test in nightly test suite failed with: JMXTest:clientjava.lang.InterruptedException
  Causing the LockInterruptTest to be skipped with ibm 1.5 jvm unil SR13 is
  available; this test caused a jvm bug in the handling of waitFor() to pop up.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java?rev=1071640&r1=1071639&r2=1071640&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
Thu Feb 17 15:21:46 2011
@@ -25,6 +25,8 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Properties;
 import junit.framework.Test;
+import junit.framework.TestSuite;
+
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
@@ -51,6 +53,18 @@ public class LockInterruptTest extends B
     }
 
     public static Test suite() {
+        
+        if (! isSunJVM()) {
+            // DERBY-4463 test fails on IBM VM 1.5.
+            // It's fixed in IBM VM 1.6 SR9 and above.
+            // Remove this condition when that issue is solved in IBM VM 1.5 SR13.
+            if (getSystemProperty("java.version").startsWith("1.5.0"))
+            {
+                println("Test skipped for this VM, cf. DERBY-4463");
+                return new TestSuite("empty LockInterruptTest");
+            }
+        }
+        
         // Only run in embedded mode since we cannot interrupt the engine
         // thread from the network client.
         Test test = TestConfiguration.embeddedSuite(LockInterruptTest.class);



Mime
View raw message