You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2015/02/11 16:27:42 UTC
[4/4] activemq git commit: reduce test duration,
relax derbydb durability - AMQ5266SingleDestTest
reduce test duration, relax derbydb durability - AMQ5266SingleDestTest
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/25376afa
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/25376afa
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/25376afa
Branch: refs/heads/master
Commit: 25376afac1d504e5c068ca44d6a47cedf188cfe5
Parents: 95f7262
Author: gtully <ga...@gmail.com>
Authored: Wed Feb 11 15:27:45 2015 +0000
Committer: gtully <ga...@gmail.com>
Committed: Wed Feb 11 15:27:45 2015 +0000
----------------------------------------------------------------------
.../src/test/java/org/apache/activemq/TestSupport.java | 6 ++++--
.../java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java | 6 ++++++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/25376afa/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java b/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
index 7ebe11c..90c1bd2 100755
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
@@ -183,7 +183,9 @@ public abstract class TestSupport extends CombinationTestSupport {
PersistenceAdapter adapter = null;
switch (choice) {
case JDBC:
- adapter = new JDBCPersistenceAdapter();
+ JDBCPersistenceAdapter jdbcPersistenceAdapter = new JDBCPersistenceAdapter();
+ jdbcPersistenceAdapter.setUseLock(false); // rollback (at shutdown) on derby can take a long time with file io etc
+ adapter = jdbcPersistenceAdapter;
break;
case KahaDB:
adapter = new KahaDBPersistenceAdapter();
@@ -196,7 +198,7 @@ public abstract class TestSupport extends CombinationTestSupport {
break;
}
broker.setPersistenceAdapter(adapter);
- adapter.setDirectory(broker.getBrokerDataDirectory());
+ adapter.setDirectory(new File(broker.getBrokerDataDirectory(), choice.name()));
return adapter;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/25376afa/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
index cfd6534..0d7f44b 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java
@@ -44,6 +44,7 @@ import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -97,6 +98,11 @@ public class AMQ5266SingleDestTest {
public int consumerBatchSize = 25;
+ @BeforeClass
+ public static void derbyTestMode() throws Exception {
+ System.setProperty("derby.system.durability","test");
+ }
+
@Before
public void startBroker() throws Exception {
brokerService = new BrokerService();