You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2020/06/06 20:09:38 UTC
[maven-surefire] branch master updated: Using localhost (not local
loopback) in SurefireForkChannel.java
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git
The following commit(s) were added to refs/heads/master by this push:
new 5f492fa Using localhost (not local loopback) in SurefireForkChannel.java
5f492fa is described below
commit 5f492fa0f22c3b5a18508c11c3429bcc62388d5f
Author: tibordigana <ti...@apache.org>
AuthorDate: Sat Jun 6 22:09:11 2020 +0200
Using localhost (not local loopback) in SurefireForkChannel.java
---
.../maven/plugin/surefire/extensions/SurefireForkChannel.java | 2 +-
.../org/apache/maven/surefire/extensions/ForkChannelTest.java | 8 +++++---
.../apache/maven/surefire/api/util/internal/AsyncSocketTest.java | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
index 3ca2dad..cf522e8 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java
@@ -84,7 +84,7 @@ final class SurefireForkChannel extends ForkChannel
super( arguments );
server = open( withThreadPool( THREAD_POOL ) );
setTrueOptions( SO_REUSEADDR, TCP_NODELAY, SO_KEEPALIVE );
- InetAddress ip = Inet4Address.getLoopbackAddress();
+ InetAddress ip = Inet4Address.getLocalHost();
server.bind( new InetSocketAddress( ip, 0 ), 1 );
InetSocketAddress localAddress = (InetSocketAddress) server.getLocalAddress();
localHost = localAddress.getHostString();
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
index ac30a66..01bb8f3 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/ForkChannelTest.java
@@ -33,6 +33,7 @@ import javax.annotation.Nonnull;
import java.io.Closeable;
import java.io.File;
import java.io.IOException;
+import java.net.InetAddress;
import java.net.Socket;
import java.net.URI;
import java.nio.ByteBuffer;
@@ -98,9 +99,10 @@ public class ForkChannelTest
assertThat( channel.getCountdownCloseablePermits() )
.isEqualTo( 3 );
+ String localHost = InetAddress.getLocalHost().getHostAddress();
assertThat( channel.getForkNodeConnectionString() )
- .startsWith( "tcp://127.0.0.1:" )
- .isNotEqualTo( "tcp://127.0.0.1:" );
+ .startsWith( "tcp://" + localHost + ":" )
+ .isNotEqualTo( "tcp://" + localHost + ":" );
URI uri = new URI( channel.getForkNodeConnectionString() );
@@ -171,7 +173,7 @@ public class ForkChannelTest
@Override
public void run()
{
- try ( Socket socket = new Socket( "127.0.0.1", port ) )
+ try ( Socket socket = new Socket( InetAddress.getLocalHost().getHostAddress(), port ) )
{
byte[] data = new byte[128];
int readLength = socket.getInputStream().read( data );
diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java
index 0128736..004d743 100644
--- a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java
+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/AsyncSocketTest.java
@@ -191,7 +191,7 @@ public class AsyncSocketTest
@SuppressWarnings( "checkstyle:magicnumber" )
private void client() throws Exception
{
- InetSocketAddress hostAddress = new InetSocketAddress( InetAddress.getLoopbackAddress(), address.getPort() );
+ InetSocketAddress hostAddress = new InetSocketAddress( InetAddress.getLocalHost(), address.getPort() );
AsynchronousSocketChannel clientSocketChannel = AsynchronousSocketChannel.open();
clientSocketChannel.connect( hostAddress ).get(); // Wait until connection is done.
InputStream is = new BufferedInputStream( newInputStream( clientSocketChannel ), 64 * 1024 );