From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Fri, 4 Sep 2015 07:13:12 +0000 (+0200)
Subject: Fix test false-positives when port is already in use
X-Git-Tag: 5.2-RC1~503
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b87a4ac9478262ad261dbd6ec3378a7d4a46efd1;p=sonarqube.git

Fix test false-positives when port is already in use
---

diff --git a/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java b/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java
index 44fcfb7677d..5dd5813917f 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/NetworkUtils.java
@@ -39,7 +39,7 @@ public class NetworkUtils {
     try  {
       socket = new ServerSocket();
       socket.setReuseAddress(true);
-      socket.bind(new InetSocketAddress(0));
+      socket.bind(new InetSocketAddress("localhost", 0));
       return socket.getLocalPort();
 
     } catch (IOException e) {
diff --git a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
index f19f42c5345..576d274a669 100644
--- a/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/util/DefaultHttpDownloaderTest.java
@@ -111,9 +111,9 @@ public class DefaultHttpDownloaderTest {
         }
       }
     });
-    SocketAddress address = socketConnection.connect(new InetSocketAddress(0));
+    SocketAddress address = socketConnection.connect(new InetSocketAddress("localhost", 0));
 
-    baseUrl = "http://0.0.0.0:" + ((InetSocketAddress) address).getPort();
+    baseUrl = String.format("http://%s:%d", ((InetSocketAddress) address).getAddress().getHostAddress(), ((InetSocketAddress) address).getPort());
   }
 
   @AfterClass
@@ -197,7 +197,7 @@ public class DefaultHttpDownloaderTest {
     File toFile = new File(toDir, "downloadToFile.txt");
 
     try {
-      int port = new InetSocketAddress(0).getPort();
+      int port = new InetSocketAddress("localhost", 0).getPort();
       new DefaultHttpDownloader(new Settings()).download(new URI("http://localhost:" + port), toFile);
     } catch (SonarException e) {
       assertThat(toFile).doesNotExist();