Skip test when filesystem does not have xattr Addresses regression from a104944 seen on CloudBees.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/7869d92b Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/7869d92b Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/7869d92b Branch: refs/heads/master Commit: 7869d92b299de3e82a0555056b850b01111ac45f Parents: e1a5c52 Author: Andrew Gaul <[email protected]> Authored: Fri Sep 5 16:25:57 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Sep 5 17:53:59 2014 -0700 ---------------------------------------------------------------------- .../strategy/internal/FilesystemStorageStrategyImplTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/7869d92b/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 c24458e..10bc59e 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 @@ -16,7 +16,7 @@ */ package org.jclouds.filesystem.strategy.internal; -import static org.jclouds.utils.TestUtils.isMacOSX; +import static java.nio.file.Files.getFileStore; import static org.jclouds.utils.TestUtils.randomByteSource; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; @@ -27,6 +27,8 @@ import static org.testng.Assert.fail; import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Paths; +import java.nio.file.attribute.UserDefinedFileAttributeView; import java.util.Iterator; import java.util.List; import java.util.Set; @@ -531,8 +533,8 @@ public class FilesystemStorageStrategyImplTest { } public void testOverwriteBlobMetadata() throws Exception { - if (isMacOSX()) { - throw new SkipException("blob metadata not supported on Mac OS X"); + if (!getFileStore(Paths.get(TestUtils.TARGET_BASE_DIR)).supportsFileAttributeView(UserDefinedFileAttributeView.class)) { + throw new SkipException("Filesystem does not support xattr"); } String blobKey = TestUtils.createRandomBlobKey("writePayload-", ".img");
