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 2015/04/11 08:12:16 UTC
jclouds git commit: Fix testCopyIfModifiedSince for AWS S3
Repository: jclouds
Updated Branches:
refs/heads/master a6ca5a363 -> 21a422bc7
Fix testCopyIfModifiedSince for AWS S3
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/21a422bc
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/21a422bc
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/21a422bc
Branch: refs/heads/master
Commit: 21a422bc71ec9aeaa7f0caaaded0af9dc7cef345
Parents: a6ca5a3
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Apr 10 23:11:21 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Apr 10 23:11:21 2015 -0700
----------------------------------------------------------------------
apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/21a422bc/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 0d0b4cf..ae53535 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientLiveTest.java
@@ -40,6 +40,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
import org.jclouds.blobstore.KeyNotFoundException;
import org.jclouds.blobstore.domain.Blob;
@@ -388,6 +389,9 @@ public class S3ClientLiveTest extends BaseBlobStoreIntegrationTest {
ifSourceModifiedSince(before));
validateContent(destinationContainer, destinationKey);
+ // Sleep since Amazon returns 200 if the date is in the future:
+ // https://forums.aws.amazon.com/message.jspa?messageID=325930
+ TimeUnit.SECONDS.sleep(20);
try {
getApi().copyObject(containerName, sourceKey + "mod", destinationContainer, destinationKey,
ifSourceModifiedSince(after));