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

Exclude tier tests on OSX

This commit is contained in:
Ignasi Barrera 2017-10-23 22:41:34 +02:00
parent c901bf3a0f
commit f7b74d95c9
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apis/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemBlobIntegrationTest.java
View File

@ -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");
}
}
}

2
blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
View File

@ -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();