Repository: brooklyn-server Updated Branches: refs/heads/master da7550d0f -> 61ac3cc4a
[rt-felix] embedded framework test survives teardown When deleting files during teardown, if a temporary file can't be deleted then the test should not fail for that reason. Log that the file could not be delete and carry on. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/9f89562c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/9f89562c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/9f89562c Branch: refs/heads/master Commit: 9f89562caf16b58154c31366d89f54b8bebced21 Parents: da7550d Author: Paul Campbell <[email protected]> Authored: Mon Nov 5 10:50:46 2018 +0000 Committer: Paul Campbell <[email protected]> Committed: Tue Nov 6 15:15:44 2018 +0000 ---------------------------------------------------------------------- .../apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/9f89562c/utils/rt-felix/src/test/java/org/apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java ---------------------------------------------------------------------- diff --git a/utils/rt-felix/src/test/java/org/apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java b/utils/rt-felix/src/test/java/org/apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java index 11dfe27..cde02b1 100644 --- a/utils/rt-felix/src/test/java/org/apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java +++ b/utils/rt-felix/src/test/java/org/apache/brooklyn/rt/felix/EmbeddedFelixFrameworkTest.java @@ -66,7 +66,11 @@ public class EmbeddedFelixFrameworkTest { EmbeddedFelixFramework.stopFramework(framework); framework = null; if (storageTempDir != null) { - FileUtils.deleteDirectory(storageTempDir); + try { + FileUtils.deleteDirectory(storageTempDir); + } catch (IOException e) { + log.warn(e.getMessage()); + } storageTempDir = null; } }
