From 89446c7af078cd9fa45d1272b037c125fb0fa003 Mon Sep 17 00:00:00 2001 From: gtully Date: Wed, 19 Mar 2014 15:30:34 +0000 Subject: [PATCH] fix intermittent failure - exceptions that result from broker stop need to be ignored as this test forces a restart --- .../usecases/DurableSubProcessMultiRestartTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java index d15bfd80de..8d3117b73f 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/usecases/DurableSubProcessMultiRestartTest.java @@ -21,6 +21,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; +import java.io.IOException; import java.util.Vector; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -38,6 +39,7 @@ import org.apache.activemq.broker.BrokerFactory; import org.apache.activemq.broker.BrokerService; import org.apache.activemq.command.ActiveMQTopic; import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter; +import org.apache.activemq.transport.InactivityIOException; import org.apache.activemq.util.Wait; import org.junit.After; import org.junit.Before; @@ -251,6 +253,12 @@ public class DurableSubProcessMultiRestartTest { unsubscribe(); + } catch (JMSException maybe) { + if (maybe.getCause() instanceof IOException) { + // ok on broker shutdown; + } else { + exit(toString() + " failed with JMSException", maybe); + } } catch (Throwable e) { exit(toString() + " failed.", e); }