From 6dc3d789c1aa1cc0e0df7fa3ad24f672a047a999 Mon Sep 17 00:00:00 2001
From: "adrian.f.cole" <adrian.f.cole@3d8758e0-26b5-11de-8745-db77d3ebf521>
Date: Sun, 9 Aug 2009 22:47:03 +0000
Subject: [PATCH] fixed integration test that downloads remote files

git-svn-id: http://jclouds.googlecode.com/svn/trunk@1846 3d8758e0-26b5-11de-8745-db77d3ebf521
---
 .../java/org/jclouds/aws/s3/S3ConnectionLiveTest.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java
index 3a58b0b9b2..35976dbe08 100644
--- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java
+++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/S3ConnectionLiveTest.java
@@ -46,17 +46,17 @@ import org.testng.annotations.Test;
 public class S3ConnectionLiveTest extends S3IntegrationTest {
 
    private static final String sysHttpStreamUrl = System.getProperty("jclouds.s3.httpstream.url");
-   private static final String sysHttpStreamETag = System.getProperty("jclouds.s3.httpstream.eTag");
+   private static final String sysHttpStreamETag = System.getProperty("jclouds.s3.httpstream.md5");
 
    @Test
-   @Parameters( { "jclouds.s3.httpstream.url", "jclouds.s3.httpstream.eTag" })
+   @Parameters( { "jclouds.s3.httpstream.url", "jclouds.s3.httpstream.md5" })
    public void testCopyUrl(@Optional String httpStreamUrl, @Optional String httpStreamETag)
             throws Exception {
       httpStreamUrl = checkNotNull(httpStreamUrl != null ? httpStreamUrl : sysHttpStreamUrl,
                "httpStreamUrl");
 
       httpStreamETag = checkNotNull(httpStreamETag != null ? httpStreamETag : sysHttpStreamETag,
-               "httpStreamETag");
+               "httpStreamMd5");
 
       String key = "hello";
 
@@ -73,7 +73,7 @@ public class S3ConnectionLiveTest extends S3IntegrationTest {
       object.getMetadata().setSize(length);
       String bucketName = getBucketName();
       try {
-         byte[] newETag = client.putObject(bucketName, object).get(30, TimeUnit.SECONDS);
+         byte[] newETag = client.putObject(bucketName, object).get(180, TimeUnit.SECONDS);
          assertEquals(newETag, eTag);
       } finally {
          returnBucket(bucketName);