resolve conflict

Bughue · Feb 4, 2024 · fe00da5 · fe00da5
1 parent 2910eb2
commit fe00da5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java
@@ -37,11 +37,6 @@ public static void before() {
         MockServer.start();
     }
 
-    @AfterAll
-    public static void after() {
-        MockServer.close();
-    }
-
     @Test
     public void testCommit() throws TransactionException {
         String xid = doTestCommit(0);

diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java
@@ -50,10 +50,7 @@ public static void before() {
         MockServer.start();
     }
 
-    @AfterAll
-    public static void after() {
-        MockServer.close();
-    }
+
 
     @Test
     public void testRm() throws TransactionException {

diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java
@@ -45,10 +45,6 @@ public static void before() {
         MockServer.start();
     }
 
-    @AfterAll
-    public static void after() {
-        MockServer.close();
-    }
 
     @Test
     public void testTm() throws Exception {