Repository: jclouds Updated Branches: refs/heads/master 24f9af7c6 -> 3cabb196c
fix usermetadata check on OS X Java on OS X does not support extended attributes, which the filesystem blobstore uses to implement user metadata. This disable the relevant test on OS X Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3cabb196 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3cabb196 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3cabb196 Branch: refs/heads/master Commit: 3cabb196ce62418ea497ff3087690c802f8ca7e4 Parents: 24f9af7 Author: Ka-Hing Cheung <[email protected]> Authored: Mon Jan 19 14:01:11 2015 -0800 Committer: Andrew Gaul <[email protected]> Committed: Tue Jan 20 17:33:22 2015 -0800 ---------------------------------------------------------------------- .../integration/FilesystemBlobIntegrationTest.java | 11 +++++++++++ .../integration/internal/BaseBlobIntegrationTest.java | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/3cabb196/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 f5ca672..a34af23 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 @@ -17,6 +17,7 @@ package org.jclouds.filesystem.integration; import java.io.IOException; +import java.util.Map; import java.util.Properties; import org.jclouds.blobstore.domain.Blob; @@ -75,4 +76,14 @@ public class FilesystemBlobIntegrationTest extends BaseBlobIntegrationTest { public void testCreateBlobWithExpiry() throws InterruptedException { super.testCreateBlobWithExpiry(); } + + /* 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 (!org.jclouds.utils.TestUtils.isMacOSX()) { + super.checkUserMetadata(userMetadata1, userMetadata2); + } + } + } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3cabb196/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 a89b7cd..ec2cfef 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 @@ -555,6 +555,10 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { testPut(payload, new ByteSourcePayload(byteSource), length, new PutOptions().multipart(true)); } + protected void checkUserMetadata(Map<String, String> userMetadata1, Map<String, String> userMetadata2) { + assertThat(userMetadata1).isEqualTo(userMetadata2); + } + private void testPut(Payload payload, Payload expectedPayload, long length, PutOptions options) throws IOException, InterruptedException { BlobStore blobStore = view.getBlobStore(); @@ -581,7 +585,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { } validateMetadata(blob.getMetadata(), container, blob.getMetadata().getName()); checkContentMetadata(blob); - assertThat(blob.getMetadata().getUserMetadata()).isEqualTo(userMetadata); + checkUserMetadata(blob.getMetadata().getUserMetadata(), userMetadata); } finally { returnContainer(container); }
