You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/07/11 23:42:32 UTC
jclouds git commit: Add S3Proxy profile to skip failing tests
Repository: jclouds
Updated Branches:
refs/heads/master 6bff97b6d -> 08e78c979
Add S3Proxy profile to skip failing tests
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/08e78c97
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/08e78c97
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/08e78c97
Branch: refs/heads/master
Commit: 08e78c979e6c241bebbb1d451d8359b3c49e7205
Parents: 6bff97b
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Jul 11 14:17:33 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Jul 11 16:42:09 2016 -0700
----------------------------------------------------------------------
apis/s3/pom.xml | 23 ++++++++++++++++++++
.../java/org/jclouds/s3/S3ClientLiveTest.java | 4 ++++
.../integration/S3ContainerLiveTest.java | 22 +++++++++++++++++++
.../jclouds/s3/services/BucketsLiveTest.java | 3 +++
4 files changed, 52 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/08e78c97/apis/s3/pom.xml
----------------------------------------------------------------------
diff --git a/apis/s3/pom.xml b/apis/s3/pom.xml
index 8f4c738..37e764c 100644
--- a/apis/s3/pom.xml
+++ b/apis/s3/pom.xml
@@ -139,6 +139,29 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>s3proxy</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludedGroups>fails-on-s3proxy</excludedGroups>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/08e78c97/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
index a4b87a1..73a9eff 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
@@ -111,6 +111,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
return url;
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testPutCannedAccessPolicyPublic() throws Exception {
String containerName = getContainerName();
try {
@@ -130,6 +131,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testCopyCannedAccessPolicyPublic() throws Exception {
String containerName = getContainerName();
String destinationContainer = getContainerName();
@@ -154,6 +156,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
String sourceKey = "apples";
String destinationKey = "pears";
+ @Test(groups = {"fails-on-s3proxy"})
public void testPublicWriteOnObject() throws InterruptedException, ExecutionException, TimeoutException, IOException {
final String publicReadWriteObjectKey = "public-read-write-acl";
final String containerName = getContainerName();
@@ -191,6 +194,7 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testUpdateObjectACL() throws InterruptedException, ExecutionException, TimeoutException, IOException {
String containerName = getContainerName();
try {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/08e78c97/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3ContainerLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3ContainerLiveTest.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3ContainerLiveTest.java
index 7c90ea6..48e7dc7 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3ContainerLiveTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/integration/S3ContainerLiveTest.java
@@ -16,6 +16,9 @@
*/
package org.jclouds.s3.blobstore.integration;
+import java.io.IOException;
+import java.net.MalformedURLException;
+
import org.jclouds.blobstore.integration.internal.BaseBlobStoreIntegrationTest;
import org.jclouds.blobstore.integration.internal.BaseContainerLiveTest;
import org.testng.annotations.Test;
@@ -27,4 +30,23 @@ public class S3ContainerLiveTest extends BaseContainerLiveTest {
provider = "s3";
BaseBlobStoreIntegrationTest.SANITY_CHECK_RETURNED_BUCKET_NAME = true;
}
+
+ @Override
+ @Test(groups = {"live", "fails-on-s3proxy"})
+ public void testPublicAccess() throws InterruptedException, MalformedURLException, IOException {
+ super.testPublicAccess();
+ }
+
+ @Override
+ @Test(groups = {"live", "fails-on-s3proxy"}, dependsOnMethods = "testPublicAccess")
+ public void testPublicAccessInNonDefaultLocation() throws InterruptedException, MalformedURLException, IOException {
+ super.testPublicAccessInNonDefaultLocation();
+ }
+
+ @Override
+ @Test(groups = {"live", "fails-on-s3proxy"}, dependsOnMethods = "testPublicAccess")
+ public void testPublicAccessInNonDefaultLocationWithBigBlob() throws InterruptedException, MalformedURLException,
+ IOException {
+ super.testPublicAccessInNonDefaultLocationWithBigBlob();
+ }
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/08e78c97/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java b/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
index bb9891f..285f72b 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/services/BucketsLiveTest.java
@@ -108,6 +108,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testUpdateBucketACL() throws InterruptedException, ExecutionException, TimeoutException, IOException,
Exception {
String bucketName = getContainerName();
@@ -177,6 +178,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testBucketPayer() throws Exception {
final String bucketName = getContainerName();
try {
@@ -207,6 +209,7 @@ public class BucketsLiveTest extends BaseBlobStoreIntegrationTest {
}
}
+ @Test(groups = {"fails-on-s3proxy"})
public void testBucketLogging() throws Exception {
final String bucketName = getContainerName();
final String targetBucket = getContainerName();