HADOOP-13183. S3A proxy tests fail after httpclient/httpcore upgrade. Contributed by Steve Loughran.

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
     }
   }