mirror of https://github.com/apache/jclouds.git
JCLOUDS-1489: expect S3 put archive to succeed
This commit is contained in:
parent
222fb84f5c
commit
a4855eb9fd
|
@ -16,17 +16,13 @@
|
|||
*/
|
||||
package org.jclouds.s3.blobstore.integration;
|
||||
|
||||
import static org.assertj.core.api.Fail.failBecauseExceptionWasNotThrown;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.Properties;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
import org.jclouds.blobstore.integration.internal.BaseBlobIntegrationTest;
|
||||
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
|
||||
import org.jclouds.http.HttpResponseException;
|
||||
import org.jclouds.s3.blobstore.strategy.MultipartUpload;
|
||||
import org.testng.SkipException;
|
||||
import org.testng.annotations.Test;
|
||||
|
||||
@Test(groups = "live", testName = "S3BlobIntegrationLiveTest")
|
||||
|
@ -48,30 +44,10 @@ public class S3BlobIntegrationLiveTest extends BaseBlobIntegrationTest {
|
|||
protected long getMinimumMultipartBlobSize() {
|
||||
return MultipartUpload.MIN_PART_SIZE + 1;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
@Test(expectedExceptions = IllegalArgumentException.class)
|
||||
public void testPutObjectStream() throws InterruptedException, IOException, ExecutionException {
|
||||
super.testPutObjectStream();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void testPutBlobTierArchive() throws Exception {
|
||||
try {
|
||||
super.testPutBlobTierArchive();
|
||||
failBecauseExceptionWasNotThrown(HttpResponseException.class);
|
||||
} catch (HttpResponseException hre) {
|
||||
throw new SkipException("S3 does not allow setting Glacier storage class on putBlob", hre);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void testPutBlobTierArchiveMultipart() throws Exception {
|
||||
try {
|
||||
super.testPutBlobTierArchiveMultipart();
|
||||
failBecauseExceptionWasNotThrown(HttpResponseException.class);
|
||||
} catch (HttpResponseException hre) {
|
||||
throw new SkipException("S3 does not allow setting Glacier storage class on putBlob", hre);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue