Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-941: Ignore metadata tests on Mac OS X 

Also make testOverwriteBlobMetadata consistent with other tests.
This commit is contained in:
Andrew Gaul 2015-06-22 11:48:31 -07:00
parent 37a014ae00
commit 38fa41d056
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apis/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java
View File

@ -16,7 +16,6 @@
*/ */
package org.jclouds.filesystem.strategy.internal; package org.jclouds.filesystem.strategy.internal;
import static java.nio.file.Files.getFileStore;
import static org.jclouds.utils.TestUtils.randomByteSource; import static org.jclouds.utils.TestUtils.randomByteSource;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertFalse;
@ -27,8 +26,6 @@ import static org.testng.Assert.fail;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Paths;
import java.nio.file.attribute.UserDefinedFileAttributeView;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -47,7 +44,6 @@ import org.jclouds.io.payloads.InputStreamPayload;
import org.jclouds.util.Throwables2; import org.jclouds.util.Throwables2;
import org.testng.annotations.AfterMethod; import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeMethod;
import org.testng.SkipException;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -369,6 +365,7 @@ public class FilesystemStorageStrategyImplTest {
blobKey.substring(0, blobKey.length() - 1))); blobKey.substring(0, blobKey.length() - 1)));
} }
@Test(dataProvider = "ignoreOnMacOSX")
public void testGetBlobContentType_AutoDetect_True() throws IOException { public void testGetBlobContentType_AutoDetect_True() throws IOException {
FilesystemStorageStrategyImpl storageStrategyAutoDetectContentType = new FilesystemStorageStrategyImpl( FilesystemStorageStrategyImpl storageStrategyAutoDetectContentType = new FilesystemStorageStrategyImpl(
new Provider<BlobBuilder>() { new Provider<BlobBuilder>() {
@ -394,6 +391,7 @@ public class FilesystemStorageStrategyImplTest {
assertEquals(blob.getMetadata().getContentMetadata().getContentType(), "video/mp4"); assertEquals(blob.getMetadata().getContentMetadata().getContentType(), "video/mp4");
} }
@Test(dataProvider = "ignoreOnMacOSX")
public void testGetBlobContentType_AutoDetect_False() throws IOException { public void testGetBlobContentType_AutoDetect_False() throws IOException {
String blobKey = TestUtils.createRandomBlobKey("file-", ".jpg"); String blobKey = TestUtils.createRandomBlobKey("file-", ".jpg");
TestUtils.createBlobsInContainer(CONTAINER_NAME, blobKey); TestUtils.createBlobsInContainer(CONTAINER_NAME, blobKey);
@ -622,10 +620,8 @@ public class FilesystemStorageStrategyImplTest {
} }
} }
@Test(dataProvider = "ignoreOnMacOSX")
public void testOverwriteBlobMetadata() throws Exception { public void testOverwriteBlobMetadata() throws Exception {
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"); String blobKey = TestUtils.createRandomBlobKey("writePayload-", ".img");
// write blob // write blob