diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java index 7a225a3..0e3190f 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/webapp/JerseyTestBase.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.apache.hadoop.net.ServerSocketUtil; -import org.junit.Before; + import com.sun.jersey.test.framework.JerseyTest; import com.sun.jersey.test.framework.WebAppDescriptor; @@ -30,9 +30,14 @@ public JerseyTestBase(WebAppDescriptor appDescriptor) { super(appDescriptor); } - @Before - public void initializeJerseyPort() throws IOException { - int jerseyPort = ServerSocketUtil.getPort(9998, 10); - System.setProperty("jersey.test.port", Integer.toString(jerseyPort)); + @Override + protected int getPort(int port) { + int jerseyPort = port; + try { + jerseyPort = ServerSocketUtil.getPort(port, 10); + } catch (IOException e) { + // Ignore and use the default port + } + return jerseyPort; } } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java index c329629..93632de 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServices.java @@ -188,7 +188,7 @@ public void testInvalidAccept() throws JSONException, Exception { try { responseStr = r.path("ws").path("v1").path("cluster") .accept(MediaType.TEXT_PLAIN).get(String.class); - fail("should have thrown exception on invalid uri"); + fail("should have thrown exception on invalid uri accept"); } catch (UniformInterfaceException ue) { ClientResponse response = ue.getResponse(); assertEquals(Status.INTERNAL_SERVER_ERROR,