(incubator-uniffle) branch master updated: [#1675][FOLLOWUP] fix(test): Fix flaky tests which may cause port conflicts (#1696)

[zuston]

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

zuston pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-uniffle.git


The following commit(s) were added to refs/heads/master by this push:
     new 4f4f7e39e [#1675][FOLLOWUP] fix(test): Fix flaky tests which may cause 
port conflicts (#1696)
4f4f7e39e is described below

commit 4f4f7e39e1b87aea952e06cc791e32446da4e3b7
Author: RickyMa <rick...@tencent.com>
AuthorDate: Wed May 15 13:45:40 2024 +0800

    [#1675][FOLLOWUP] fix(test): Fix flaky tests which may cause port conflicts 
(#1696)
    
    ### What changes were proposed in this pull request?
    
    Fix some flaky tests which may cause port conflicts sometimes.
    
    ### Why are the changes needed?
    
    Fix: https://github.com/apache/incubator-uniffle/issues/1675.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Unnecessary.
---
 .../src/test/java/org/apache/uniffle/test/ServletTest.java   | 12 +++++++++---
 .../java/org/apache/uniffle/server/ShuffleServerTest.java    |  1 +
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git 
a/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
 
b/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
index 39ceb6734..6e4b7ca05 100644
--- 
a/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
+++ 
b/integration-test/common/src/test/java/org/apache/uniffle/test/ServletTest.java
@@ -105,7 +105,9 @@ public class ServletTest extends IntegrationTestBase {
     shuffleServerConf.set(
         RssBaseConf.RPC_SERVER_PORT,
         shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT) + 1);
-    shuffleServerConf.set(RssBaseConf.JETTY_HTTP_PORT, 18081);
+    shuffleServerConf.set(
+        RssBaseConf.JETTY_HTTP_PORT,
+        shuffleServerConf.getInteger(ShuffleServerConf.JETTY_HTTP_PORT) + 1);
     rpcPort2 = shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT);
     createShuffleServer(shuffleServerConf);
     File dataDir5 = new File(tmpDir, "data5");
@@ -115,7 +117,9 @@ public class ServletTest extends IntegrationTestBase {
     shuffleServerConf.set(
         RssBaseConf.RPC_SERVER_PORT,
         shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT) + 1);
-    shuffleServerConf.set(RssBaseConf.JETTY_HTTP_PORT, 18082);
+    shuffleServerConf.set(
+        RssBaseConf.JETTY_HTTP_PORT,
+        shuffleServerConf.getInteger(ShuffleServerConf.JETTY_HTTP_PORT) + 1);
     rpcPort3 = shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT);
     createShuffleServer(shuffleServerConf);
     File dataDir7 = new File(tmpDir, "data7");
@@ -125,7 +129,9 @@ public class ServletTest extends IntegrationTestBase {
     shuffleServerConf.set(
         RssBaseConf.RPC_SERVER_PORT,
         shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT) + 1);
-    shuffleServerConf.set(RssBaseConf.JETTY_HTTP_PORT, 18083);
+    shuffleServerConf.set(
+        RssBaseConf.JETTY_HTTP_PORT,
+        shuffleServerConf.getInteger(ShuffleServerConf.JETTY_HTTP_PORT) + 1);
     rpcPort4 = shuffleServerConf.getInteger(ShuffleServerConf.RPC_SERVER_PORT);
     createShuffleServer(shuffleServerConf);
     startServers();
diff --git 
a/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java 
b/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
index 471b0aaa0..55aa433c4 100644
--- a/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
+++ b/server/src/test/java/org/apache/uniffle/server/ShuffleServerTest.java
@@ -154,6 +154,7 @@ public class ShuffleServerTest {
     } catch (Exception e) {
       assertEquals(expectMessage, e.getMessage());
       assertEquals(expectStatus, ((ExitException) e).getStatus());
+      ss1.stopServer();
       return;
     }
     fail();