Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
Reply-To: "Derby Development" <derby-dev@db.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1413885 - in /db/derby/code/branches/10.8: ./
 java/client/org/apache/derby/client/net/NetCursor.java
 java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java
Date: Mon, 26 Nov 2012 21:52:28 -0000
To: derby-commits@db.apache.org
From: myrnavl@apache.org
Message-Id: <20121126215228.BE9292388A32@eris.apache.org>

Author: myrnavl
Date: Mon Nov 26 21:52:27 2012
New Revision: 1413885

URL: http://svn.apache.org/viewvc?rev=1413885&view=rev
Log:
DERBY-5975; intermittent nightly test failure across releases in Derby5937SlaveShutdownTest.testSlaveFailoverLeak
  backport of revision 1412392 and revision 1413812 from trunk - disable the test for weme.

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/replicationTests/Derby5937SlaveShutdownTest.java

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1412392,1413812

Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1412392,1413812

Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java?rev=1413885&r1=1413884&r2=1413885&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/replicationTests/Derby5937SlaveShutdownTest.java Mon Nov 26 21:52:27 2012
@@ -26,8 +26,10 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import javax.sql.DataSource;
 import junit.framework.Test;
+import junit.framework.TestSuite;
 import org.apache.derbyTesting.functionTests.util.PrivilegedFileOpsForTests;
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
+import org.apache.derbyTesting.junit.BaseTestCase;
 import org.apache.derbyTesting.junit.JDBCDataSource;
 import org.apache.derbyTesting.junit.NetworkServerTestSetup;
 import org.apache.derbyTesting.junit.SecurityManagerSetup;
@@ -63,6 +65,13 @@ public class Derby5937SlaveShutdownTest 
     }
 
     public static Test suite() {
+        //DERBY-5975 test fails intermittently with weme causing a hang.
+        // Likely a jvm issue, so don't run on that OS...
+        if (BaseTestCase.isJ9Platform())
+        {
+            Test test = new TestSuite("Derby5937SlaveShutdownTest");
+            return test;
+        }
         Class klass = Derby5937SlaveShutdownTest.class;
         // The default security policy doesn't allow derby.jar to do
         // networking. Disable the security manager for this test.