hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aengin...@apache.org
Subject [34/50] hadoop git commit: HADOOP-13183. S3A proxy tests fail after httpclient/httpcore upgrade. Contributed by Steve Loughran.
Date Mon, 23 May 2016 23:21:12 GMT
HADOOP-13183. S3A proxy tests fail after httpclient/httpcore upgrade. Contributed by Steve
Loughran.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/93258459
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/93258459
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/93258459

Branch: refs/heads/HDFS-1312
Commit: 93258459faf56bc84121ba99d20eaef95273329e
Parents: 21d2b90
Author: Chris Nauroth <cnauroth@apache.org>
Authored: Thu May 19 22:00:21 2016 -0700
Committer: Chris Nauroth <cnauroth@apache.org>
Committed: Thu May 19 22:00:21 2016 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/fs/s3a/TestS3AConfiguration.java  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/93258459/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
index 7928ea9..4f3c7ae 100644
--- a/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
+++ b/hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AConfiguration.java
@@ -123,9 +123,7 @@ public class TestS3AConfiguration {
       fs = S3ATestUtils.createTestFileSystem(conf);
       fail("Expected a connection error for proxy server at " + proxy);
     } catch (AmazonClientException e) {
-      if (!e.getMessage().contains(proxy + " refused")) {
-        throw e;
-      }
+      // expected
     }
   }
 
@@ -158,18 +156,14 @@ public class TestS3AConfiguration {
       fs = S3ATestUtils.createTestFileSystem(conf);
       fail("Expected a connection error for proxy server");
     } catch (AmazonClientException e) {
-      if (!e.getMessage().contains("443")) {
-        throw e;
-      }
+      // expected
     }
     conf.set(Constants.SECURE_CONNECTIONS, "false");
     try {
       fs = S3ATestUtils.createTestFileSystem(conf);
       fail("Expected a connection error for proxy server");
     } catch (AmazonClientException e) {
-      if (!e.getMessage().contains("80")) {
-        throw e;
-      }
+      // expected
     }
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message