From 93b5cfb71b30e6786fb34e6c0d77a906879c7f7e Mon Sep 17 00:00:00 2001 From: nickfelt Date: Mon, 27 Feb 2017 14:53:39 -0800 Subject: [PATCH] Make RdeUploadActionTest compatible with IPv6-only mode This fixes an issue where RdeUploadActionTest relies on connecting to a local dummy SFTP server via the IPv4 loopback (127.0.0.1), which causes the test to fail on machines that only support IPv6. This updates the test to use just "localhost" instead. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=148698178 --- .../google/registry/rde/RdeUploadActionTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/javatests/google/registry/rde/RdeUploadActionTest.java b/javatests/google/registry/rde/RdeUploadActionTest.java index 09d8c0811..bc0c9bc4a 100644 --- a/javatests/google/registry/rde/RdeUploadActionTest.java +++ b/javatests/google/registry/rde/RdeUploadActionTest.java @@ -254,7 +254,7 @@ public class RdeUploadActionTest { @Test public void testSocketConnection() throws Exception { int port = sftpd.serve("user", "password", folder.getRoot()); - try (Socket socket = new Socket("::1", port)) { + try (Socket socket = new Socket("localhost", port)) { assertThat(socket.isConnected()).isTrue(); } } @@ -278,7 +278,7 @@ public class RdeUploadActionTest { // XXX: For any port other than 22, JSch will reformat the hostname IPv6 style which causes // known host matching to fail. int port = sftpd.serve("user", "password", folder.getRoot()); - URI uploadUrl = URI.create(String.format("sftp://user:password@127.0.0.1:%d/", port)); + URI uploadUrl = URI.create(String.format("sftp://user:password@localhost:%d/", port)); DateTime stagingCursor = DateTime.parse("2010-10-18TZ"); DateTime uploadCursor = DateTime.parse("2010-10-17TZ"); persistResource( @@ -299,7 +299,7 @@ public class RdeUploadActionTest { @Test public void testRunWithLock_failsAfterThreeAttempts() throws Exception { int port = sftpd.serve("user", "password", folder.getRoot()); - URI uploadUrl = URI.create(String.format("sftp://user:password@127.0.0.1:%d/", port)); + URI uploadUrl = URI.create(String.format("sftp://user:password@localhost:%d/", port)); DateTime stagingCursor = DateTime.parse("2010-10-18TZ"); DateTime uploadCursor = DateTime.parse("2010-10-17TZ"); persistResource( @@ -313,7 +313,7 @@ public class RdeUploadActionTest { @Test public void testRunWithLock_copiesOnGcs() throws Exception { int port = sftpd.serve("user", "password", folder.getRoot()); - URI uploadUrl = URI.create(String.format("sftp://user:password@127.0.0.1:%d/", port)); + URI uploadUrl = URI.create(String.format("sftp://user:password@localhost:%d/", port)); DateTime stagingCursor = DateTime.parse("2010-10-18TZ"); DateTime uploadCursor = DateTime.parse("2010-10-17TZ"); persistResource( @@ -341,7 +341,7 @@ public class RdeUploadActionTest { RdeRevision.saveRevision("tld", DateTime.parse("2010-10-17TZ"), FULL, 1); }}); int port = sftpd.serve("user", "password", folder.getRoot()); - URI uploadUrl = URI.create(String.format("sftp://user:password@127.0.0.1:%d/", port)); + URI uploadUrl = URI.create(String.format("sftp://user:password@localhost:%d/", port)); DateTime stagingCursor = DateTime.parse("2010-10-18TZ"); DateTime uploadCursor = DateTime.parse("2010-10-17TZ"); persistSimpleResource( @@ -361,7 +361,7 @@ public class RdeUploadActionTest { public void testRunWithLock_producesValidSignature() throws Exception { assumeTrue(hasCommand("gpg --version")); int port = sftpd.serve("user", "password", folder.getRoot()); - URI uploadUrl = URI.create(String.format("sftp://user:password@127.0.0.1:%d/", port)); + URI uploadUrl = URI.create(String.format("sftp://user:password@localhost:%d/", port)); DateTime stagingCursor = DateTime.parse("2010-10-18TZ"); DateTime uploadCursor = DateTime.parse("2010-10-17TZ"); persistResource(