You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2016/01/15 11:35:14 UTC
[2/2] ambari git commit: AMBARI-14661. Ambari Server Unit Test failure
(org.apache.ambari.server.bootstrap.BootStrapResourceTest.bootStrapGet|bootStrapPost)
(aonishuk)
AMBARI-14661. Ambari Server Unit Test failure (org.apache.ambari.server.bootstrap.BootStrapResourceTest.bootStrapGet|bootStrapPost) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91d5d030
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91d5d030
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91d5d030
Branch: refs/heads/branch-2.2
Commit: 91d5d03023aa3d7e1ded3314bb4ee3070759b4a5
Parents: 5b60f56
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Fri Jan 15 12:35:05 2016 +0200
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Fri Jan 15 12:35:05 2016 +0200
----------------------------------------------------------------------
.../ambari/server/bootstrap/BootStrapResourceTest.java | 13 +++++++++++++
1 file changed, 13 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/91d5d030/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
index e433879..0e8a562 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/bootstrap/BootStrapResourceTest.java
@@ -24,7 +24,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import java.io.IOException;
import java.util.ArrayList;
+import java.net.ServerSocket;
import javax.ws.rs.core.MediaType;
@@ -80,6 +82,17 @@ public class BootStrapResourceTest extends JerseyTest {
injector = Guice.createInjector(new MockModule());
}
+ @Override
+ protected int getPort(int defaultPort) {
+ // Find a free port
+ try (ServerSocket socket = new ServerSocket(0)) {
+ return socket.getLocalPort();
+ } catch (IOException e) {
+ // Ignore
+ }
+ return defaultPort;
+ }
+
protected JSONObject createDummySshInfo() throws JSONException {
JSONObject json = new JSONObject();
json.put("sshkey", "awesome");