svn commit: r892316 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java

[da...@apache.org]

Author: dag
Date: Fri Dec 18 17:02:48 2009
New Revision: 892316

URL: http://svn.apache.org/viewvc?rev=892316&view=rev
Log:
DERBY-4463 JMX test in nightly test suite failed with: JMXTest:clientjava.lang.InterruptedException

Patch derby-4463-except-non-sun-vm disables this test for non-Sun
VMs. This is intended as a temporary measure until we understand why
the test is not working correctly on IBM VMs.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java?rev=892316&r1=892315&r2=892316&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby151Test.java Fri Dec 18 17:02:48 2009
@@ -61,9 +61,20 @@
             // that do database access - for they require a
             // DriverManager connection to jdbc:default:connection;
             // DriverManager is not supported with JSR169.
-            suite.addTestSuite(Derby151Test.class);
-            return new CleanDatabaseTestSetup(
-                new TestSuite(Derby151Test.class, name));
+
+            if ("Sun Microsystems Inc.".equals(
+                        System.getProperty("java.vendor"))) {
+
+                suite.addTestSuite(Derby151Test.class);
+                return new CleanDatabaseTestSetup(
+                    new TestSuite(Derby151Test.class, name));
+
+            } else {
+                // DERBY-4463 test fails on IBM VMs. Remove this
+                // exception when that issue is solved.
+                println("Test skipped for this VM, cf. DERBY-4463");
+                return suite;
+            }
         } else {
             return suite;
         }