From bc68e2cb2e6dd6128ec0eee64ce00094d04413fe Mon Sep 17 00:00:00 2001
From: Andrew Gaul <andrew@gaul.org>
Date: Sun, 31 Jan 2016 12:47:51 -0800
Subject: [PATCH] Do not run marker tests when backend lacks support

---
 .../java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java | 11 +++++++++++
 .../JcloudsS3ContainerIntegrationLiveTest.java        | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
index 9c3fe6f..0e11d5f 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsBucketsLiveTest.java
@@ -45,6 +45,7 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
                             "0"));
     private S3Proxy s3Proxy;
     private BlobStoreContext context;
+    private String blobStoreType;
 
     @AfterClass
     public void tearDown() throws Exception {
@@ -65,6 +66,7 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
             info = TestUtils.startS3Proxy();
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
+            blobStoreType = context.unwrap().getProviderMetadata().getId();
         } catch (Exception e) {
             throw Throwables.propagate(e);
         }
@@ -115,4 +117,13 @@ public final class JcloudsBucketsLiveTest extends BucketsLiveTest {
             throw new SkipException("bucket logging not supported", are);
         }
     }
+
+    @Override
+    public void testListBucketMarker()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        if (Quirks.OPAQUE_MARKERS.contains(blobStoreType)) {
+            throw new SkipException("opaque markers not supported");
+        }
+        super.testListBucketMarker();
+    }
 }
diff --git a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
index 499fc11..dc4fc0f 100644
--- a/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
+++ b/src/test/java/org/gaul/s3proxy/JcloudsS3ContainerIntegrationLiveTest.java
@@ -25,6 +25,7 @@ import com.google.common.util.concurrent.Uninterruptibles;
 import org.jclouds.Constants;
 import org.jclouds.blobstore.BlobStoreContext;
 import org.jclouds.s3.blobstore.integration.S3ContainerIntegrationLiveTest;
+import org.testng.SkipException;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
@@ -38,6 +39,7 @@ public final class JcloudsS3ContainerIntegrationLiveTest
                             "0"));
     private S3Proxy s3Proxy;
     private BlobStoreContext context;
+    private String blobStoreType;
 
     @AfterClass
     public void tearDown() throws Exception {
@@ -58,6 +60,7 @@ public final class JcloudsS3ContainerIntegrationLiveTest
             info = TestUtils.startS3Proxy();
             s3Proxy = info.getS3Proxy();
             context = info.getBlobStore().getContext();
+            blobStoreType = context.unwrap().getProviderMetadata().getId();
         } catch (Exception e) {
             throw Throwables.propagate(e);
         }
@@ -70,4 +73,12 @@ public final class JcloudsS3ContainerIntegrationLiveTest
         props.setProperty(Constants.PROPERTY_STRIP_EXPECT_HEADER, "true");
         return props;
     }
+
+    @Override
+    public void testListMarkerAfterLastKey() throws Exception {
+        if (Quirks.OPAQUE_MARKERS.contains(blobStoreType)) {
+            throw new SkipException("opaque markers not supported");
+        }
+        super.testListMarkerAfterLastKey();
+    }
 }