Use Entities.destroyAllCatching in tearDown of live tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/6109dd66 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/6109dd66 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/6109dd66 Branch: refs/heads/0.6.0 Commit: 6109dd663f17e363598765b74b73f8ec1c73078c Parents: 8b7ba88 Author: Andrew Kennedy <[email protected]> Authored: Thu Nov 14 13:26:56 2013 +0000 Committer: Andrew Kennedy <[email protected]> Committed: Thu Nov 14 13:26:56 2013 +0000 ---------------------------------------------------------------------- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- .../location/jclouds/JcloudsLoginLiveTest.java | 2 +- .../entity/AbstractGoogleComputeLiveTest.java | 2 +- .../entity/BrooklynMgmtContextTestSupport.java | 15 +++------------ .../whirr/hadoop/WhirrHadoopClusterLiveTest.java | 2 +- 5 files changed, 7 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6109dd66/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java index d17e910..980b068 100644 --- a/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java +++ b/core/src/test/java/brooklyn/event/feed/windows/WindowsPerformanceCounterFeedLiveTest.java @@ -83,7 +83,7 @@ public class WindowsPerformanceCounterFeedLiveTest { @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { - if (mgmt != null) Entities.destroyAll(mgmt); + if (mgmt != null) Entities.destroyAllCatching(mgmt); mgmt = null; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6109dd66/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLoginLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLoginLiveTest.java b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLoginLiveTest.java index 4d7c4ea..3a2dfef 100644 --- a/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLoginLiveTest.java +++ b/locations/jclouds/src/test/java/brooklyn/location/jclouds/JcloudsLoginLiveTest.java @@ -98,7 +98,7 @@ public class JcloudsLoginLiveTest { if (machine != null) jcloudsLocation.release(machine); machine = null; } finally { - if (managementContext != null) Entities.destroyAll(managementContext); + if (managementContext != null) Entities.destroyAllCatching(managementContext); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6109dd66/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java index c9203a2..dc2a7ea 100644 --- a/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java +++ b/software/base/src/test/java/brooklyn/entity/AbstractGoogleComputeLiveTest.java @@ -63,7 +63,7 @@ public abstract class AbstractGoogleComputeLiveTest { @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { - if (app != null) Entities.destroyAll(app.getManagementContext()); + if (app != null) Entities.destroyAllCatching(app.getManagementContext()); } @Test(groups = {"Live"}) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6109dd66/software/base/src/test/java/brooklyn/entity/BrooklynMgmtContextTestSupport.java ---------------------------------------------------------------------- diff --git a/software/base/src/test/java/brooklyn/entity/BrooklynMgmtContextTestSupport.java b/software/base/src/test/java/brooklyn/entity/BrooklynMgmtContextTestSupport.java index bef60ff..e64728c 100644 --- a/software/base/src/test/java/brooklyn/entity/BrooklynMgmtContextTestSupport.java +++ b/software/base/src/test/java/brooklyn/entity/BrooklynMgmtContextTestSupport.java @@ -1,7 +1,5 @@ package brooklyn.entity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; @@ -12,8 +10,6 @@ import brooklyn.test.entity.TestApplication; public class BrooklynMgmtContextTestSupport { - private static final Logger LOG = LoggerFactory.getLogger(BrooklynMgmtContextTestSupport.class); - protected TestApplication app; protected ManagementContext mgmt; @@ -29,13 +25,8 @@ public class BrooklynMgmtContextTestSupport { @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { - try { - if (mgmt != null) Entities.destroyAll(mgmt); - } catch (Throwable t) { - LOG.error("Caught exception in tearDown method", t); - } finally { - mgmt = null; - } + if (mgmt != null) Entities.destroyAllCatching(mgmt); + mgmt = null; } - + } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/6109dd66/systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java ---------------------------------------------------------------------- diff --git a/systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java b/systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java index 495aff4..e014e19 100644 --- a/systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java +++ b/systems/whirr/hadoop/src/test/java/brooklyn/extras/whirr/hadoop/WhirrHadoopClusterLiveTest.java @@ -37,7 +37,7 @@ public class WhirrHadoopClusterLiveTest { @AfterMethod(alwaysRun=true) public void tearDown() throws Exception { - if (app != null) Entities.destroyAll(app.getManagementContext()); + if (app != null) Entities.destroyAllCatching(app.getManagementContext()); } @Test(groups = { "Live" })
