You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ha...@apache.org on 2015/02/13 00:22:23 UTC
[4/6] activemq git commit: reduce test duration,
relax derbydb durability - AMQ5266SingleDestTest
reduce test duration, relax derbydb durability - AMQ5266SingleDestTest
Conflicts:
activemq-unit-tests/src/test/java/org/apache/activemq/TestSupport.java
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/b4e6cb6a
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/b4e6cb6a
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/b4e6cb6a
Branch: refs/heads/activemq-5.11.x
Commit: b4e6cb6af53a1f264314ebfdd6ee771097d0e5c2
Parents: 9b2a6dc
Author: gtully <ga...@gmail.com>
Authored: Wed Feb 11 15:27:45 2015 +0000
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Thu Feb 12 18:21:43 2015 -0500
----------------------------------------------------------------------
.../src/test/java/org/apache/activemq/TestSupport.java | 5 ++++-
.../java/org/apache/activemq/bugs/AMQ5266SingleDestTest.java | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/b4e6cb6a/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 80aac14..a762f89 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,6 +198,7 @@ public abstract class TestSupport extends CombinationTestSupport {
break;
}
broker.setPersistenceAdapter(adapter);
+ adapter.setDirectory(new File(broker.getBrokerDataDirectory(), choice.name()));
return adapter;
}
http://git-wip-us.apache.org/repos/asf/activemq/blob/b4e6cb6a/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();