workaround test failures due to invalid hostnames on jenkins slaves

adriancole · adriancole · commit ef9700b7c3f2 · 2013-06-28T15:13:04.000-07:00
diff --git a/feign-ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java b/feign-ribbon/src/test/java/feign/ribbon/LoadBalancingTargetTest.java
@@ -69,6 +69,7 @@ public void loadBalancingDefaultPolicyRoundRobin() throws IOException, Interrupt
   }
 
   static String hostAndPort(URL url) {
-    return url.getHost() + ":" + url.getPort();
+    // our build slaves have underscores in their hostnames which aren't permitted by ribbon
+    return "localhost:" + url.getPort();
   }
 }
diff --git a/feign-ribbon/src/test/java/feign/ribbon/RibbonClientTest.java b/feign-ribbon/src/test/java/feign/ribbon/RibbonClientTest.java
@@ -69,6 +69,7 @@ public void loadBalancingDefaultPolicyRoundRobin() throws IOException, Interrupt
   }
 
   static String hostAndPort(URL url) {
-    return url.getHost() + ":" + url.getPort();
+    // our build slaves have underscores in their hostnames which aren't permitted by ribbon
+    return "localhost:" + url.getPort();
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,7 @@ public void loadBalancingDefaultPolicyRoundRobin() throws IOException, Interrupt`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`static String hostAndPort(URL url) {`
`72`		`- return url.getHost() + ":" + url.getPort();`
	`72`	`+ // our build slaves have underscores in their hostnames which aren't permitted by ribbon`
	`73`	`+ return "localhost:" + url.getPort();`
`73`	`74`	`}`
`74`	`75`	`}`