Enhance Unit test stability. (alibaba#8346)

* Enhance Unit test stability. * print detail stacktrace when unit test error.
onewe · May 11, 2022 · 3998026 · 3998026
1 parent ed999d9
commit 3998026
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Build with Maven
         run: mvn -Prelease-nacos -Dmaven.test.skip=true clean install -U
       - name: Test With Maven
-        run: mvn -Prelease-nacos clean test
+        run: mvn -Prelease-nacos clean test -DtrimStackTrace=false
       - name: Codecov
         uses: codecov/codecov-action@v3.1.0
         with:

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/remote/udp/UdpConnector.java b/naming/src/main/java/com/alibaba/nacos/naming/remote/udp/UdpConnector.java
@@ -50,13 +50,19 @@ public class UdpConnector {
 
     private final DatagramSocket udpSocket;
 
+    private volatile boolean running = true;
+
     public UdpConnector() throws SocketException {
         this.ackMap = new ConcurrentHashMap<>();
         this.callbackMap = new ConcurrentHashMap<>();
         this.udpSocket = new DatagramSocket();
         GlobalExecutor.scheduleUdpReceiver(new UdpReceiver());
     }
 
+    public void shutdown() {
+        running = false;
+    }
+
     public boolean containAck(String ackId) {
         return ackMap.containsKey(ackId);
     }
@@ -180,7 +186,7 @@ private class UdpReceiver implements Runnable {
 
         @Override
         public void run() {
-            while (true) {
+            while (running) {
                 byte[] buffer = new byte[1024 * 64];
                 DatagramPacket packet = new DatagramPacket(buffer, buffer.length);
                 try {

diff --git a/naming/src/test/java/com/alibaba/nacos/naming/controllers/OperatorControllerTest.java b/naming/src/test/java/com/alibaba/nacos/naming/controllers/OperatorControllerTest.java
@@ -27,6 +27,7 @@
 import com.alibaba.nacos.naming.core.v2.client.manager.ClientManager;
 import com.alibaba.nacos.naming.misc.SwitchDomain;
 import com.alibaba.nacos.naming.misc.SwitchManager;
+import com.alibaba.nacos.naming.monitor.MetricsMonitor;
 import com.alibaba.nacos.sys.env.Constants;
 import com.alibaba.nacos.sys.env.EnvUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -86,6 +87,7 @@ public void setUp() {
 
     @Test
     public void testPushState() {
+        MetricsMonitor.resetPush();
         ObjectNode objectNode = operatorController.pushState(true, true);
         Assert.assertTrue(objectNode.toString().contains("succeed\":0"));
     }

diff --git a/naming/src/test/java/com/alibaba/nacos/naming/remote/udp/UdpConnectorTest.java b/naming/src/test/java/com/alibaba/nacos/naming/remote/udp/UdpConnectorTest.java
@@ -20,6 +20,7 @@
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.remote.PushCallBack;
 import com.alibaba.nacos.sys.env.EnvUtil;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -82,6 +83,11 @@ public void setUp() throws IOException, InterruptedException {
         TimeUnit.SECONDS.sleep(1);
     }
 
+    @After
+    public void tearDown() {
+        udpConnector.shutdown();
+    }
+
     @Test
     public void testContainAck() {
         when(ackMap.containsKey(Mockito.anyString())).thenReturn(true);