Use Entities.destroyAllCatching in tearDown of live tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/f02be6a0 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/f02be6a0 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/f02be6a0 Branch: refs/heads/0.6.0 Commit: f02be6a0a61b38a89670a001e836c767661d07fc Parents: ce69ed1 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 ---------------------------------------------------------------------- .../java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/f02be6a0/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java ---------------------------------------------------------------------- diff --git a/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java b/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java index c5dcd6a..73d4ffb 100644 --- a/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java +++ b/software/network/src/test/java/brooklyn/entity/network/bind/BindDnsServerLiveTest.java @@ -51,14 +51,12 @@ public class BindDnsServerLiveTest { @AfterMethod(alwaysRun = true) public void shutdown() throws Exception { - Entities.destroyAll(app.getManagementContext()); - // Thread.sleep(TimeUnit.MINUTES.toMillis(30)); + if (app != null) Entities.destroyAllCatching(app.getManagementContext()); } @DataProvider(name = "virtualMachineData") public Object[][] provideVirtualMachineData() { return new Object[][] { // ImageId, Provider, Region - new Object[] { "", "named:cloudera" }, new Object[] { "eu-west-1/ami-029f9476", "aws-ec2:eu-west-1" }, }; }
