You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/03/29 00:12:48 UTC

svn commit: r1462346 - /activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java

Author: tabish
Date: Thu Mar 28 23:12:48 2013
New Revision: 1462346

URL: http://svn.apache.org/r1462346
Log:
patch some test code: https://issues.apache.org/jira/browse/AMQ-4296

Modified:
    activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java

Modified: activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java?rev=1462346&r1=1462345&r2=1462346&view=diff
==============================================================================
--- activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java (original)
+++ activemq/trunk/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTransactionTest.java Thu Mar 28 23:12:48 2013
@@ -143,8 +143,14 @@ public class FailoverTransactionTest ext
     }
 
     public void initCombosForTestFailoverCommitReplyLost() {
-        addCombinationValues("defaultPersistenceAdapter",
-                new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC});
+        String osName = System.getProperty("os.name");
+        Object[] persistenceAdapters;
+        if (!osName.equalsIgnoreCase("AIX") && !osName.equalsIgnoreCase("SunOS")) {
+            persistenceAdapters = new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.LevelDB, PersistenceAdapterChoice.JDBC};
+        } else {
+            persistenceAdapters = new Object[]{PersistenceAdapterChoice.KahaDB, PersistenceAdapterChoice.JDBC};
+        }
+        addCombinationValues("defaultPersistenceAdapter",persistenceAdapters);
     }
 
     @SuppressWarnings("unchecked")