Skip to content

Commit a86cffa

Browse files
committed
Temp remove parellel because of hard coded ports and paths
1 parent 0d1e960 commit a86cffa

7 files changed

Lines changed: 0 additions & 24 deletions

activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveLeaseTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@
2424
import org.apache.activemq.util.LeaseLockerIOExceptionHandler;
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
27-
import org.junit.experimental.categories.Category;
28-
import org.apache.activemq.test.annotations.ParallelTest;
2927

30-
@Category(ParallelTest.class)
3128
public class DbRestartJDBCQueueMasterSlaveLeaseTest extends DbRestartJDBCQueueMasterSlaveTest {
3229
private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueMasterSlaveLeaseTest.class);
3330

activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueMasterSlaveTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,7 @@
3535
import org.apache.derby.jdbc.EmbeddedDataSource;
3636
import org.slf4j.Logger;
3737
import org.slf4j.LoggerFactory;
38-
import org.junit.experimental.categories.Category;
39-
import org.apache.activemq.test.annotations.ParallelTest;
4038

41-
@Category(ParallelTest.class)
4239
public class DbRestartJDBCQueueMasterSlaveTest extends JDBCQueueMasterSlaveTest {
4340
private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueMasterSlaveTest.class);
4441

activemq-unit-tests/src/test/java/org/apache/activemq/broker/ft/DbRestartJDBCQueueTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import org.junit.After;
3737
import org.slf4j.Logger;
3838
import org.slf4j.LoggerFactory;
39-
import org.apache.activemq.test.annotations.ParallelTest;
40-
import org.junit.experimental.categories.Category;
4139

42-
@Category(ParallelTest.class)
4340
public class DbRestartJDBCQueueTest extends JmsTopicSendReceiveWithTwoConnectionsTest implements ExceptionListener {
4441
private static final transient Logger LOG = LoggerFactory.getLogger(DbRestartJDBCQueueTest.class);
4542

activemq-unit-tests/src/test/java/org/apache/activemq/broker/policy/SendDuplicateFromStoreToDLQTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,20 @@
4444
import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
4545
import org.apache.activemq.util.IOHelper;
4646
import org.apache.activemq.util.Wait;
47-
import org.apache.activemq.test.annotations.ParallelTest;
4847
import org.slf4j.Logger;
4948
import org.slf4j.LoggerFactory;
5049
import org.junit.After;
5150
import org.junit.Before;
5251
import org.junit.Test;
5352
import org.junit.runner.RunWith;
5453
import org.junit.runners.Parameterized;
55-
import org.junit.experimental.categories.Category;
5654

5755
/**
5856
* This unit test is to test that setting the property "sendDuplicateFromStoreToDLQ" on
5957
* PolicyEntry works correctly with and without cache enabled.
6058
*
6159
*/
6260
@RunWith(value = Parameterized.class)
63-
@Category(ParallelTest.class)
6461
public class SendDuplicateFromStoreToDLQTest {
6562
private static final Logger LOG = LoggerFactory.getLogger(SendDuplicateFromStoreToDLQTest.class);
6663

activemq-unit-tests/src/test/java/org/apache/activemq/broker/scheduler/KahaDBSchedulerIndexRebuildTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@
4444
import org.junit.rules.TestName;
4545
import org.slf4j.Logger;
4646
import org.slf4j.LoggerFactory;
47-
import org.junit.experimental.categories.Category;
48-
import org.apache.activemq.test.annotations.ParallelTest;
4947

50-
@Category(ParallelTest.class)
5148
public class KahaDBSchedulerIndexRebuildTest {
5249

5350
static final Logger LOG = LoggerFactory.getLogger(KahaDBSchedulerIndexRebuildTest.class);

activemq-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,7 @@
5555
import org.apache.activemq.util.Wait;
5656
import org.slf4j.Logger;
5757
import org.slf4j.LoggerFactory;
58-
import org.junit.experimental.categories.Category;
59-
import org.apache.activemq.test.annotations.ParallelTest;
6058

61-
@Category(ParallelTest.class)
6259
public class AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest extends JmsMultipleBrokersTestSupport {
6360
static final String payload = new String(new byte[10 * 1024]);
6461
private static final Logger LOG = LoggerFactory.getLogger(AMQ4485NetworkOfXBrokersWithNDestsFanoutTransactionTest.class);
@@ -94,7 +91,6 @@ protected BrokerService createBroker(int brokerid) throws Exception {
9491
broker.setDeleteAllMessagesOnStartup(true);
9592
broker.getManagementContext().setCreateConnector(false);
9693

97-
9894
broker.setUseJmx(true);
9995
broker.setBrokerName("B" + brokerid);
10096
broker.addConnector(new URI("tcp://localhost:0"));
@@ -103,7 +99,6 @@ protected BrokerService createBroker(int brokerid) throws Exception {
10399
broker.getSystemUsage().setSendFailIfNoSpace(true);
104100
broker.getSystemUsage().getMemoryUsage().setLimit(512 * 1024 * 1024);
105101

106-
107102
PolicyMap policyMap = new PolicyMap();
108103
PolicyEntry policyEntry = new PolicyEntry();
109104
policyEntry.setExpireMessagesPeriod(0);
@@ -159,7 +154,6 @@ public void testBrokers() throws Exception {
159154

160155
verifyPeerBrokerInfos(numBrokers - 1);
161156

162-
163157
final List<ConsumerState> consumerStates = startAllGWConsumers(numBrokers);
164158

165159
startAllGWFanoutConsumers(numBrokers);

activemq-unit-tests/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreOrderTest.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,8 @@
2020

2121
import org.apache.activemq.broker.BrokerService;
2222
import org.apache.activemq.store.StoreOrderTest;
23-
import org.junit.experimental.categories.Category;
24-
import org.apache.activemq.test.annotations.ParallelTest;
2523

2624
// https://issues.apache.org/activemq/browse/AMQ-2594
27-
@Category(ParallelTest.class)
2825
public class KahaDBStoreOrderTest extends StoreOrderTest {
2926

3027
@Override

0 commit comments

Comments
 (0)