wip

Author: stoty

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestJobEndNotifier.java

@@ -116,6 +116,8 @@ private void testTimeout(Configuration conf) {
   private void testProxyConfiguration(Configuration conf) {
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "somehost");
     setConf(conf);
+    //Newer JDKs add IP, convert to older format
+    String proxyToUseStr = proxyToUse.toString().replaceAll("/<unresolved>", "");
     assertTrue(proxyToUse.type() == Proxy.Type.DIRECT,
         "Proxy shouldn't be set because port wasn't specified");
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "somehost:someport");
@@ -124,19 +126,19 @@ private void testProxyConfiguration(Configuration conf) {
         "Proxy shouldn't be set because port wasn't numeric");
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "somehost:1000");
     setConf(conf);
-    assertEquals("HTTP @ somehost:1000", proxyToUse.toString(),
+    assertEquals("HTTP @ somehost:1000", proxyToUseStr,
         "Proxy should have been set but wasn't ");
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "socks@somehost:1000");
     setConf(conf);
-    assertEquals("SOCKS @ somehost:1000", proxyToUse.toString(),
+    assertEquals("SOCKS @ somehost:1000", proxyToUseStr,
         "Proxy should have been socks but wasn't ");
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "SOCKS@somehost:1000");
     setConf(conf);
-    assertEquals("SOCKS @ somehost:1000", proxyToUse.toString(),
+    assertEquals("SOCKS @ somehost:1000", proxyToUseStr,
         "Proxy should have been socks but wasn't ");
     conf.set(MRJobConfig.MR_JOB_END_NOTIFICATION_PROXY, "sfafn@somehost:1000");
     setConf(conf);
-    assertEquals("HTTP @ somehost:1000", proxyToUse.toString(),
+    assertEquals("HTTP @ somehost:1000", proxyToUseStr,
         "Proxy should have been http but wasn't ");
   }