Repository: jclouds Updated Branches: refs/heads/master 3a65df1e2 -> b2c0786fc
Enable range tests for azureblob Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/b2c0786f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/b2c0786f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/b2c0786f Branch: refs/heads/master Commit: b2c0786fc0cf10430980fcc270c2194f88ca6e86 Parents: 3a65df1 Author: Andrew Gaul <[email protected]> Authored: Sat Jan 23 12:38:50 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Sat Jan 23 12:38:50 2016 -0800 ---------------------------------------------------------------------- .../integration/internal/BaseBlobIntegrationTest.java | 2 +- .../org/jclouds/azureblob/AzureBlobClientLiveTest.java | 11 ++--------- .../integration/AzureBlobIntegrationLiveTest.java | 6 ------ 3 files changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/b2c0786f/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java index 8442377..7740dbc 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java @@ -413,7 +413,7 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest { Blob blob3 = view.getBlobStore().getBlob(container, name, new GetOptions().tail(TEST_STRING.length() + 10)); validateMetadata(blob3.getMetadata(), container, name); assertEquals(getContentAsStringOrNullAndClose(blob3), TEST_STRING); - assertThat(blob3.getAllHeaders().get(HttpHeaders.CONTENT_RANGE)).containsExactly("bytes 0-45/46"); + // not all providers return Content-Range for non-partial responses } finally { returnContainer(container); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/b2c0786f/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java index 7bc7236..bef20c2 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/AzureBlobClientLiveTest.java @@ -331,15 +331,8 @@ public class AzureBlobClientLiveTest extends BaseBlobStoreIntegrationTest { assertEquals(e.getResponse().getStatusCode(), 412); } - // Range - // doesn't work per - // http://social.msdn.microsoft.com/Forums/en-US/windowsazure/thread/479fa63f-51df-4b66-96b5-33ae362747b6 - // getBlob = getApi() - // .getBlob(privateContainer, object.getProperties().getName(), - // GetOptions.Builder.startAt(8)).get(120, - // TimeUnit.SECONDS); - // assertEquals(Utils.toStringAndClose((InputStream) getBlob.getData()), - // data.substring(8)); + getBlob = getApi().getBlob(privateContainer, object.getProperties().getName(), GetOptions.Builder.startAt(8)); + assertEquals(Strings2.toStringAndClose(getBlob.getPayload().openStream()), data.substring(8)); getApi().deleteBlob(privateContainer, "object"); getApi().deleteBlob(privateContainer, "chunked-object"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/b2c0786f/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java index 1799d3d..67223fc 100644 --- a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java +++ b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/integration/AzureBlobIntegrationLiveTest.java @@ -64,10 +64,4 @@ public class AzureBlobIntegrationLiveTest extends BaseBlobIntegrationTest { public void testPutBlobAccessMultipart() throws Exception { super.testPutBlobAccessMultipart(); } - - @Override - @Test - public void testGetRange() { - throw new SkipException("Currently broken on Azure"); - } }
