You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/02/06 06:26:47 UTC
jclouds git commit: Make testGetIfUnmodifiedSince a lot more robust
(but slower)
Repository: jclouds
Updated Branches:
refs/heads/master 66457ff8f -> 041b047a2
Make testGetIfUnmodifiedSince a lot more robust (but slower)
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/041b047a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/041b047a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/041b047a
Branch: refs/heads/master
Commit: 041b047a2d37cb77999720c5e15ad207fdfc8785
Parents: 66457ff
Author: Zack Shoylev <za...@rackspace.com>
Authored: Thu Feb 5 22:29:12 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Feb 5 23:26:23 2015 -0600
----------------------------------------------------------------------
.../integration/internal/BaseBlobIntegrationTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/041b047a/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 ec2cfef..003c5b0 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
@@ -106,11 +106,11 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
File payloadFile = File.createTempFile("testPutFileParallel", "png");
createTestInput(32 * 1024).copyTo(Files.asByteSink(payloadFile));
-
+
final Payload testPayload = Payloads.newFilePayload(payloadFile);
final HashCode md5 = hashAndClose(testPayload.openStream(), md5());
testPayload.getContentMetadata().setContentType("image/png");
-
+
final AtomicInteger blobCount = new AtomicInteger();
final String container = getContainerName();
try {
@@ -289,11 +289,11 @@ public class BaseBlobIntegrationTest extends BaseBlobStoreIntegrationTest {
String name = "apples";
- Date before = new Date(System.currentTimeMillis() - 5000);
+ Date before = new Date(System.currentTimeMillis() - 10000);
addObjectAndValidateContent(container, name);
- Date after = new Date(System.currentTimeMillis() + 5000);
+ Date after = new Date(System.currentTimeMillis() + 10000);
- Uninterruptibles.sleepUninterruptibly(5, TimeUnit.SECONDS);
+ Uninterruptibles.sleepUninterruptibly(15, TimeUnit.SECONDS);
view.getBlobStore().getBlob(container, name, ifUnmodifiedSince(after));
validateContent(container, name);