From 12d70604126c1d1c1ae7609936463cef5616d378 Mon Sep 17 00:00:00 2001
From: morningman <morningman@163.com>
Date: Wed, 22 Nov 2023 23:19:33 +0800
Subject: [PATCH] fix

---
 .../org/apache/doris/mysql/MysqlServerTest.java    | 14 ++++----------
 .../apache/doris/utframe/TestWithFeService.java    |  2 +-
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java
index ed62bc65040758..8b4c1fac47e782 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/mysql/MysqlServerTest.java
@@ -19,6 +19,7 @@
 
 import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.qe.ConnectScheduler;
+import org.apache.doris.utframe.TestWithFeService;
 
 import mockit.Delegate;
 import mockit.Expectations;
@@ -79,10 +80,7 @@ public Boolean answer() throws Throwable {
 
     @Test
     public void testNormal() throws IOException, InterruptedException {
-        ServerSocket socket = new ServerSocket(0);
-        int port = socket.getLocalPort();
-        socket.close();
-
+        int port = TestWithFeService.findValidPort();
         MysqlServer server = new MysqlServer(port, scheduler);
         Assert.assertTrue(server.start());
 
@@ -108,9 +106,7 @@ public void testNormal() throws IOException, InterruptedException {
 
     @Test
     public void testBindFail() throws IOException {
-        ServerSocket socket = new ServerSocket(0);
-        int port = socket.getLocalPort();
-        socket.close();
+        int port = TestWithFeService.findValidPort();
         MysqlServer server = new MysqlServer(port, scheduler);
         Assert.assertTrue(server.start());
         MysqlServer server1 = new MysqlServer(port, scheduler);
@@ -121,9 +117,7 @@ public void testBindFail() throws IOException {
 
     @Test
     public void testSubFail() throws IOException, InterruptedException {
-        ServerSocket socket = new ServerSocket(0);
-        int port = socket.getLocalPort();
-        socket.close();
+        int port = TestWithFeService.findValidPort();
         MysqlServer server = new MysqlServer(port, badScheduler);
         Assert.assertTrue(server.start());
 
diff --git a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
index d3ac91a58b20ce..911155df7a2885 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/utframe/TestWithFeService.java
@@ -498,7 +498,7 @@ protected void cleanDorisFeDir() {
         }
     }
 
-    protected int findValidPort() {
+    public static int findValidPort() {
         int port = 0;
         while (true) {
             try (ServerSocket socket = new ServerSocket(0)) {