Repository: jclouds Updated Branches: refs/heads/master 2342abd3c -> da8517f29
Increase timeouts for signed URL tests Clock skew between the client and blobstore can cause these tests to spuriously fail. This commit allows 5 seconds skew in either direction. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/da8517f2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/da8517f2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/da8517f2 Branch: refs/heads/master Commit: da8517f295b0d94854bf871c6a185eec7b8673c9 Parents: 2342abd Author: Andrew Gaul <[email protected]> Authored: Fri May 30 00:31:59 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri May 30 14:58:40 2014 -0700 ---------------------------------------------------------------------- .../integration/internal/BaseBlobSignerLiveTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/da8517f2/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java index 3596ee6..1655255 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobSignerLiveTest.java @@ -81,18 +81,19 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest { public void testSignGetUrlWithTime() throws InterruptedException, IOException { String name = "hello"; String text = "fooooooooooooooooooooooo"; + int timeout = 5; Blob blob = view.getBlobStore().blobBuilder(name).payload(text).contentType("text/plain").build(); String container = getContainerName(); try { view.getBlobStore().putBlob(container, blob); assertConsistencyAwareContainerSize(container, 1); - HttpRequest request = view.getSigner().signGetBlob(container, name, 3 /* seconds */); + HttpRequest request = view.getSigner().signGetBlob(container, name, timeout); assertEquals(request.getFilters().size(), 0); assertEquals(Strings2.toString(view.utils().http().invoke(request).getPayload()), text); - TimeUnit.SECONDS.sleep(4); + TimeUnit.SECONDS.sleep(2 * timeout); try { Strings2.toString(view.utils().http().invoke(request).getPayload()); fail("Temporary URL did not expire as expected"); @@ -126,11 +127,12 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest { public void testSignPutUrlWithTime() throws Exception { String name = "hello"; String text = "fooooooooooooooooooooooo"; + int timeout = 5; Blob blob = view.getBlobStore().blobBuilder(name).payload(text).contentType("text/plain").build(); String container = getContainerName(); try { - HttpRequest request = view.getSigner().signPutBlob(container, blob, 3 /* seconds */); + HttpRequest request = view.getSigner().signPutBlob(container, blob, timeout); assertEquals(request.getFilters().size(), 0); // Strip Expect: 100-continue to make actual responses visible, since @@ -143,7 +145,7 @@ public class BaseBlobSignerLiveTest extends BaseBlobStoreIntegrationTest { view.getBlobStore().removeBlob(container, name); assertConsistencyAwareContainerSize(container, 0); - TimeUnit.SECONDS.sleep(4); + TimeUnit.SECONDS.sleep(2 * timeout); try { Strings2.toString(view.utils().http().invoke(request).getPayload()); fail("Temporary URL did not expire as expected");
