db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r1213467 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: engine/LockInterruptTest.java store/InterruptResilienceTest.java
Date Mon, 12 Dec 2011 22:18:49 GMT
Author: myrnavl
Date: Mon Dec 12 22:18:49 2011
New Revision: 1213467

URL: http://svn.apache.org/viewvc?rev=1213467&view=rev
Log:
DERBY-4463; JMX test in nightly test suite failed with: JMXTest:clientjava.lang.InterruptedException
  reviving tests for IBM 1.5 after release of  1.5 SR13

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/engine/LockInterruptTest.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.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=1213467&r1=1213466&r2=1213467&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
Mon Dec 12 22:18:49 2011
@@ -54,17 +54,6 @@ public class LockInterruptTest extends B
 
     public static Test suite() {
         
-        if (isIBMJVM()) {
-            // 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);

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java?rev=1213467&r1=1213466&r2=1213467&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/InterruptResilienceTest.java
Mon Dec 12 22:18:49 2011
@@ -95,14 +95,6 @@ public class InterruptResilienceTest ext
         String testName = "InterruptResilienceTest";
 
         if (isIBMJVM()) {
-            // 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("InterruptResilienceTest skipped for this VM, cf. DERBY-4463");
-                return new TestSuite(testName);
-            }
             if (getSystemProperty("java.version").startsWith("1.4.2"))
             {
                 println("InterruptResilienceTest skipped for this VM, cf. DERBY-5074/5109");



Mime
View raw message