Repository: camel Updated Branches: refs/heads/master 4fdec3a4a -> 1f43d9cd7
Ignore failure during shutdown of test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e22d2eb8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e22d2eb8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e22d2eb8 Branch: refs/heads/master Commit: e22d2eb8880fe812a84d0f06ab34f4a654df0dc0 Parents: 4fdec3a Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Sep 15 15:30:30 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Sep 15 15:30:30 2016 +0200 ---------------------------------------------------------------------- .../component/cassandra/CassandraComponentBeanRefTest.java | 6 +++++- .../component/cassandra/CassandraComponentConsumerTest.java | 6 +++++- .../component/cassandra/CassandraComponentProducerTest.java | 6 +++++- .../cassandra/CassandraComponentProducerUnpreparedTest.java | 6 +++++- .../cassandra/CassandraAggregationRepositoryTest.java | 6 +++++- .../cassandra/CassandraAggregationSerializedHeadersTest.java | 7 ++++++- .../aggregate/cassandra/CassandraAggregationTest.java | 7 ++++++- .../cassandra/NamedCassandraAggregationRepositoryTest.java | 6 +++++- .../cassandra/CassandraIdempotentRepositoryTest.java | 6 +++++- .../idempotent/cassandra/CassandraIdempotentTest.java | 6 +++++- .../cassandra/NamedCassandraIdempotentRepositoryTest.java | 6 +++++- 11 files changed, 57 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java index a184401..11fe0f7 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentBeanRefTest.java @@ -46,7 +46,11 @@ public class CassandraComponentBeanRefTest extends CamelTestSupport { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java index 4b70f1a..f1b4bc9 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentConsumerTest.java @@ -45,7 +45,11 @@ public class CassandraComponentConsumerTest extends CamelTestSupport { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java index 798a008..bc32e15 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerTest.java @@ -72,7 +72,11 @@ public class CassandraComponentProducerTest extends CamelTestSupport { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java index b1c738d..324a892 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/component/cassandra/CassandraComponentProducerUnpreparedTest.java @@ -59,7 +59,11 @@ public class CassandraComponentProducerUnpreparedTest extends CamelTestSupport { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java index 217e7a6..14ec215 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationRepositoryTest.java @@ -74,7 +74,11 @@ public class CassandraAggregationRepositoryTest { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } private boolean exists(String key) { http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java index f88ef52..4c7c37a 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationSerializedHeadersTest.java @@ -25,6 +25,7 @@ import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.processor.aggregate.util.HeaderDto; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.AfterClass; import org.junit.Test; /** @@ -53,7 +54,11 @@ public class CassandraAggregationSerializedHeadersTest extends CamelTestSupport super.tearDown(); aggregationRepository.stop(); cluster.close(); - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java index d3f9208..3e9e99a 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/CassandraAggregationTest.java @@ -24,6 +24,7 @@ import org.apache.camel.component.cassandra.CassandraUnitUtils; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.processor.aggregate.AggregationStrategy; import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.AfterClass; import org.junit.Test; /** @@ -51,7 +52,11 @@ public class CassandraAggregationTest extends CamelTestSupport { super.tearDown(); aggregationRepository.stop(); cluster.close(); - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java index f46b68c..c6a41e2 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/aggregate/cassandra/NamedCassandraAggregationRepositoryTest.java @@ -75,7 +75,11 @@ public class NamedCassandraAggregationRepositoryTest { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } private boolean exists(String key) { http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java index f6b8506..3d95955 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentRepositoryTest.java @@ -63,7 +63,11 @@ public class CassandraIdempotentRepositoryTest { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } private boolean exists(String key) { http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java index e8e7338..4db74c1 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/CassandraIdempotentTest.java @@ -48,7 +48,11 @@ public class CassandraIdempotentTest extends CamelTestSupport { public void tearDown() throws Exception { super.tearDown(); idempotentRepository.stop(); - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } @Override http://git-wip-us.apache.org/repos/asf/camel/blob/e22d2eb8/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java ---------------------------------------------------------------------- diff --git a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java index db3498f..fedaa44 100644 --- a/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java +++ b/components/camel-cassandraql/src/test/java/org/apache/camel/processor/idempotent/cassandra/NamedCassandraIdempotentRepositoryTest.java @@ -65,7 +65,11 @@ public class NamedCassandraIdempotentRepositoryTest { @AfterClass public static void tearDownClass() throws Exception { - CassandraUnitUtils.cleanEmbeddedCassandra(); + try { + CassandraUnitUtils.cleanEmbeddedCassandra(); + } catch (Throwable e) { + // ignore shutdown errors + } } private boolean exists(String key) {
