interop-testing,okhttp,testing: update tests to pass with ipv6

ericgribkoff · web-flow · commit 5dc8a124bf64 · 2017-05-16T17:01:05.000-07:00
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2NettyTest.java
@@ -99,7 +99,7 @@ protected ManagedChannel createChannel() {
 
   @Test(timeout = 10000)
   public void remoteAddr() {
-    assertRemoteAddr("/127.0.0.1");
+    assertRemoteAddr("/0:0:0:0:0:0:0:1");
   }
 
   @Test(timeout = 10000)
diff --git a/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java b/interop-testing/src/test/java/io/grpc/testing/integration/Http2OkHttpTest.java
@@ -97,7 +97,7 @@ public static void stopServer() throws Exception {
 
   @Override
   protected ManagedChannel createChannel() {
-    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("127.0.0.1", getPort())
+    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("::1", getPort())
         .maxInboundMessageSize(AbstractInteropTest.MAX_MESSAGE_SIZE)
         .connectionSpec(new ConnectionSpec.Builder(OkHttpChannelBuilder.DEFAULT_CONNECTION_SPEC)
             .cipherSuites(TestUtils.preferredTestCiphers().toArray(new String[0]))
@@ -142,7 +142,7 @@ public void receivedDataForFinishedStream() throws Exception {
 
   @Test(timeout = 10000)
   public void wrongHostNameFailHostnameVerification() throws Exception {
-    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("127.0.0.1", getPort())
+    OkHttpChannelBuilder builder = OkHttpChannelBuilder.forAddress("::1", getPort())
         .connectionSpec(new ConnectionSpec.Builder(OkHttpChannelBuilder.DEFAULT_CONNECTION_SPEC)
             .cipherSuites(TestUtils.preferredTestCiphers().toArray(new String[0]))
             .tlsVersions(ConnectionSpec.MODERN_TLS.tlsVersions().toArray(new TlsVersion[0]))
diff --git a/okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java b/okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java
@@ -51,7 +51,7 @@
 public class OkHttpTransportTest extends AbstractTransportTest {
   private ClientTransportFactory clientFactory = OkHttpChannelBuilder
       // Although specified here, address is ignored because we never call build.
-      .forAddress("127.0.0.1", 0)
+      .forAddress("::1", 0)
       .negotiationType(NegotiationType.PLAINTEXT)
       .buildTransportFactory();
 
@@ -82,14 +82,14 @@ protected InternalServer newServer(
 
   @Override
   protected String testAuthority(InternalServer server) {
-    return "127.0.0.1:" + server.getPort();
+    return "[::1]:" + server.getPort();
   }
 
   @Override
   protected ManagedClientTransport newClientTransport(InternalServer server) {
     int port = server.getPort();
     return clientFactory.newClientTransport(
-        new InetSocketAddress("127.0.0.1", port),
+        new InetSocketAddress("::1", port),
         testAuthority(server),
         null /* agent */);
   }
diff --git a/testing/src/main/java/io/grpc/testing/TestUtils.java b/testing/src/main/java/io/grpc/testing/TestUtils.java
@@ -124,7 +124,7 @@ public static InetSocketAddress testServerAddress(String host, int port) {
    */
   public static InetSocketAddress testServerAddress(int port) {
     try {
-      InetAddress inetAddress = InetAddress.getByName("localhost");
+      InetAddress inetAddress = InetAddress.getByName("::1");
       inetAddress = InetAddress.getByAddress(TEST_SERVER_HOST, inetAddress.getAddress());
       return new InetSocketAddress(inetAddress, port);
     } catch (UnknownHostException e) {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ protected ManagedChannel createChannel() {`
`99`	`99`
`100`	`100`	`@Test(timeout = 10000)`
`101`	`101`	`public void remoteAddr() {`
`102`		`- assertRemoteAddr("/127.0.0.1");`
	`102`	`+ assertRemoteAddr("/0:0:0:0:0:0:0:1");`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`@Test(timeout = 10000)`