Skip to content

Commit

Permalink
test (jkube-kit/remote-dev) : Fix intermittent failures of RemoteDeve…
Browse files Browse the repository at this point in the history
…lopmentServiceTest

Signed-off-by: Rohan Kumar <rohaan@redhat.com>
  • Loading branch information
rohanKanojia committed Jan 24, 2024
1 parent be0ce2e commit b972028
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .jenkins/pipelines/java-8.Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pipeline {
exit 1
fi
'''
sh './mvnw -V -B -e install'
sh './mvnw -V -B -e install'
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import io.fabric8.kubernetes.client.KubernetesClient;
import org.eclipse.jkube.kit.common.KitLogger;

import java.net.InetAddress;
import java.net.ServerSocket;
import java.util.concurrent.CompletableFuture;

Expand Down Expand Up @@ -65,7 +66,7 @@ public void stop() {

private void checkEnvironment() {
for (RemoteService remoteService : context.getRemoteDevelopmentConfig().getRemoteServices()) {
try (ServerSocket ignore = new ServerSocket(remoteService.getLocalPort())) {
try (ServerSocket ignore = new ServerSocket(remoteService.getLocalPort(), 1, InetAddress.getByName("localhost"))) {
logger.debug("Local port '%s' for remote service '%s:%s' is available",
remoteService.getLocalPort(), remoteService.getHostname(), remoteService.getPort());
} catch (Exception e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,12 @@
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;

import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;

import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
Expand Down Expand Up @@ -118,9 +121,17 @@ void startFailsIfLocalPortInUse() {
remoteDevelopmentService = new RemoteDevelopmentService(
logger, kubernetesClient, RemoteDevelopmentConfig.builder().remoteService(remoteService).build());
assertThatThrownBy(() -> {
try (ServerSocket localPortInUse = new ServerSocket(localPort)) {
try (ServerSocket localPortInUse = new ServerSocket(localPort, 1, InetAddress.getByName("localhost"))) {
// When
remoteDevelopmentService.start();
System.out.println(localPortInUse.getInetAddress().getHostAddress());
System.out.println(localPortInUse.getLocalPort());
try (Socket socket = new Socket("localhost", localPort)) {
System.out.println(socket.getInetAddress().getHostAddress());
System.out.println(socket.getLocalPort());
assertThat(socket.isBound()).isTrue();
assertThat(socket.isClosed()).isFalse();
remoteDevelopmentService.start();
}
}
})
.hasMessageContaining("Local port '" + localPort + "' is already in use (remote-host)");
Expand Down

0 comments on commit b972028

Please sign in to comment.