Repository: jclouds Updated Branches: refs/heads/master c901bf3a0 -> f7b74d95c
Exclude tier tests on OSX Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f7b74d95 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f7b74d95 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f7b74d95 Branch: refs/heads/master Commit: f7b74d95c9fdb8cb7e099eaf0ab8d8f3b0c78d2b Parents: c901bf3 Author: Ignasi Barrera <[email protected]> Authored: Mon Oct 23 22:41:34 2017 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Wed Oct 25 08:30:49 2017 +0200 ---------------------------------------------------------------------- .../FilesystemBlobIntegrationTest.java | 22 +++++++++++++++++--- .../internal/BaseBlobIntegrationTest.java | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/f7b74d95/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java ---------------------------------------------------------------------- diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java index d469037..86140bf 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java @@ -24,14 +24,16 @@ import java.util.Properties; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.domain.BlobMetadata; +import org.jclouds.blobstore.domain.Tier; import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest; import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest; +import org.jclouds.blobstore.options.PutOptions; import org.jclouds.filesystem.reference.FilesystemConstants; import org.jclouds.filesystem.utils.TestUtils; import org.testng.annotations.Test; import org.testng.SkipException; -@Test(groups = { "integration" }, singleThreaded = true, testName = "blobstore.FilesystemBlobIntegrationTest") +@Test(groups = { "integration" }, singleThreaded = true, testName = "blobstore.FilesystemBlobIntegrationTest") public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest { public FilesystemBlobIntegrationTest() { provider = "filesystem"; @@ -80,17 +82,31 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest { super.testCreateBlobWithExpiry(); } - /* Java on OS X does not support extended attributes, which the filesystem backend - * uses to implement user metadata */ + /* + * Java on OS X does not support extended attributes, which the filesystem + * backend uses to implement user metadata + */ @Override protected void checkUserMetadata(Map<String, String> userMetadata1, Map<String, String> userMetadata2) { if (!isMacOSX()) { super.checkUserMetadata(userMetadata1, userMetadata2); } } + + @Override + protected void testPutBlobTierHelper(Tier tier, PutOptions options) throws Exception { + checkExtendedAttributesSupport(); + super.testPutBlobTierHelper(tier, options); + } @Override public void testSetBlobAccess() throws Exception { throw new SkipException("filesystem does not support anonymous access"); } + + protected void checkExtendedAttributesSupport() { + if (isMacOSX()) { + throw new SkipException("filesystem does not support extended attributes in Mac OSX"); + } + } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/f7b74d95/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java index 23f26eb..4aeca6c 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -775,7 +775,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { testPutBlobTierHelper(Tier.ARCHIVE, new PutOptions().multipart(true)); } - private void testPutBlobTierHelper(Tier tier, PutOptions options) throws Exception { + protected void testPutBlobTierHelper(Tier tier, PutOptions options) throws Exception { String blobName = "put-blob-tier-" + tier; ByteSource payload = createTestInput(1024); BlobStore blobStore = view.getBlobStore();
