From 5dc8a124bf642e0df64e7fded0f84dd5adb6ae06 Mon Sep 17 00:00:00 2001 From: Eric Gribkoff Date: Tue, 16 May 2017 17:01:05 -0700 Subject: [PATCH] interop-testing,okhttp,testing: update tests to pass with ipv6 --- .../java/io/grpc/testing/integration/Http2NettyTest.java | 2 +- .../java/io/grpc/testing/integration/Http2OkHttpTest.java | 4 ++-- .../src/test/java/io/grpc/okhttp/OkHttpTransportTest.java | 6 +++--- testing/src/main/java/io/grpc/testing/TestUtils.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) 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 index 846c584b08..635a6b8e1c 100644 --- 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 @@ public class Http2NettyTest extends AbstractInteropTest { @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 index 28d4ed1d04..8281a241bc 100644 --- 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 class Http2OkHttpTest extends AbstractInteropTest { @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 class Http2OkHttpTest extends AbstractInteropTest { @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 index 3a2386c1d6..f2a4f1aaba 100644 --- a/okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java +++ b/okhttp/src/test/java/io/grpc/okhttp/OkHttpTransportTest.java @@ -51,7 +51,7 @@ import org.junit.runners.JUnit4; 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 @@ public class OkHttpTransportTest extends AbstractTransportTest { @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 index 42b135fcd4..1e31865f1d 100644 --- 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 class TestUtils { */ 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) {