Repository: jclouds Updated Branches: refs/heads/master ac2238364 -> fc4b072a2
Ignore non-existent container in deleteContainer All other blobstore providers allow this operation. Further this matches the behavior of TransientStorageStrategy.deleteContainer. This commit prevents a spurious error message from deleteContainerOrWarnIfUnable after test suite completion. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/fc4b072a Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/fc4b072a Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/fc4b072a Branch: refs/heads/master Commit: fc4b072a26772566c07526907821fbea51aed408 Parents: ac22383 Author: Andrew Gaul <[email protected]> Authored: Mon Sep 8 18:27:08 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 8 18:37:19 2014 -0700 ---------------------------------------------------------------------- .../strategy/internal/FilesystemStorageStrategyImpl.java | 3 +++ .../org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java | 6 +----- .../strategy/internal/FilesystemStorageStrategyImplTest.java | 8 ++------ 3 files changed, 6 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/fc4b072a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index 04b3172..65919d3 100644 --- a/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java +++ b/apis/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -131,6 +131,9 @@ public class FilesystemStorageStrategyImpl implements LocalStorageStrategy { @Override public void deleteContainer(String container) { filesystemContainerNameValidator.validate(container); + if (!containerExists(container)) { + return; + } deleteDirectory(container, null); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/fc4b072a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java index 0c52a49..3129241 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java @@ -620,11 +620,7 @@ public class FilesystemAsyncBlobStoreTest { } public void testDeleteContainer_NotExistingContainer() { - try { - blobStore.deleteContainer(CONTAINER_NAME); - fail("No error when container doesn't exist"); - } catch (Exception e) { - } + blobStore.deleteContainer(CONTAINER_NAME); } public void testDeleteContainer_EmptyContanier() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/fc4b072a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java index 10bc59e..466d1a2 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java @@ -282,12 +282,8 @@ public class FilesystemStorageStrategyImplTest { TestUtils.directoryExists(CONTAINER_NAME, false); } - public void testDeleteContainer_ErrorWhenNotExists() { - try { - storageStrategy.deleteContainer(CONTAINER_NAME); - fail("Exception not throwed"); - } catch (Exception e) { - } + public void testDeleteContainerNoErrorWhenNotExists() { + storageStrategy.deleteContainer(CONTAINER_NAME); } public void testGetAllContainerNames() {
