[flume] branch trunk updated: Let Jetty pick the port

[rgoers]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git


The following commit(s) were added to refs/heads/trunk by this push:
     new a1d405f  Let Jetty pick the port
a1d405f is described below

commit a1d405fc5f6cdd300144a95d2010fd67075760c8
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Fri Jan 28 22:54:32 2022 -0700

    Let Jetty pick the port
---
 .../java/org/apache/flume/node/TestHttpConfigurationSource.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
 
b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
index e38a41d..31503a6 100644
--- 
a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
+++ 
b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
@@ -34,6 +34,7 @@ import org.apache.flume.node.net.BasicAuthorizationProvider;
 import org.apache.log4j.LogManager;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
@@ -53,11 +54,12 @@ public class TestHttpConfigurationSource {
   private static final String expectedCreds = "flume:flume";
   private static Server server;
   private static Base64.Decoder decoder = Base64.getDecoder();
+  private static int port;
 
   @BeforeClass
   public static void startServer() throws Exception {
     try {
-      server = new Server(1080);
+      server = new Server(0);
       ServletContextHandler context = new ServletContextHandler();
       ServletHolder defaultServ = new ServletHolder("default", 
TestServlet.class);
       defaultServ.setInitParameter("resourceBase", 
System.getProperty("user.dir"));
@@ -67,6 +69,7 @@ public class TestHttpConfigurationSource {
 
       // Start Server
       server.start();
+      port = ((ServerConnector) server.getConnectors()[0]).getLocalPort();
     } catch (Throwable ex) {
       ex.printStackTrace();
       throw ex;
@@ -81,14 +84,14 @@ public class TestHttpConfigurationSource {
 
   @Test(expected = ConfigurationException.class)
   public void testBadCrdentials() throws Exception {
-    URI confFile = new URI("http://localhost:1080/flume-conf.properties";);
+    URI confFile = new URI("http://localhost:"; + port + 
"/flume-conf.properties");
     AuthorizationProvider authProvider = new BasicAuthorizationProvider("foo", 
"bar");
     ConfigurationSource source = new HttpConfigurationSource(confFile, 
authProvider, true);
   }
 
   @Test
   public void testGet() throws Exception {
-    URI confFile = new URI("http://localhost:1080/flume-conf.properties";);
+    URI confFile = new URI("http://localhost:"; + port + 
"/flume-conf.properties");
     AuthorizationProvider authProvider = new 
BasicAuthorizationProvider("flume", "flume");
     ConfigurationSource source = new HttpConfigurationSource(confFile, 
authProvider, true);
     Assert.assertNotNull("No configuration returned", source);