This is an automated email from the ASF dual-hosted git repository.
hefengen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new be65a99263 [type:fix] fix e2e error. (#5152)
be65a99263 is described below
commit be65a992635611885856fad109f2ca3082f0713e
Author: yunlongn <[email protected]>
AuthorDate: Thu Sep 14 14:54:19 2023 +0800
[type:fix] fix e2e error. (#5152)
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
* [type:fix] fix e2e error.
---------
Co-authored-by: xiaoyu <[email protected]>
---
.../shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynEtcdTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java | 4 +++-
.../apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java | 4 +++-
.../apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/apachedubbo/DataSynEtcdTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java | 4 +++-
.../apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java | 4 +++-
.../test/java/org/apache/shenyu/e2e/testcase/brpc/BrpcPluginTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/brpc/DataSynEtcdTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/brpc/DataSynHttpTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/brpc/DataSynNacosTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/brpc/DataSynZookeeperTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/motan/DataSynEtcdTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java | 4 +++-
.../java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java | 3 ++-
.../java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java | 3 ++-
.../org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java | 3 ++-
.../test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java | 3 ++-
.../org/apache/shenyu/e2e/testcase/springcloud/DataSynEtcdTest.java | 4 ++--
.../org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java | 4 +++-
.../org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java | 4 +++-
.../apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java | 4 +++-
.../apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java | 4 +++-
29 files changed, 82 insertions(+), 30 deletions(-)
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
index fd1c821e03..0346d14ad0 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/AlibabaDubboPluginTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -78,8 +79,9 @@ public class AlibabaDubboPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynEtcdTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynEtcdTest.java
index e2fe951d68..222dcbd71c 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynEtcdTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynEtcdTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -65,8 +66,9 @@ public class DataSynEtcdTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
index 4ee879010f..a3fd8e1dcf 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
index d34e6bea5c..b35fc6aae3 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,8 +68,9 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
index e076ceadd9..ddc743dcb0 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-alibaba-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/alibabadubbo/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.alibabadubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
index 013833207b..597a0899ab 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/ApacheDubboPluginTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.apachedubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -78,8 +79,9 @@ public class ApacheDubboPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynEtcdTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynEtcdTest.java
index 53812c8b52..0ea60fecd2 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynEtcdTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynEtcdTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.apachedubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -65,8 +66,9 @@ public class DataSynEtcdTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
index d1f9dcd1e3..018688ea73 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.apachedubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
index 687a562393..cf0e409168 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.apachedubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,8 +68,9 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
index 34f44763e3..3b23286709 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-apache-dubbo/src/test/java/org/apache/shenyu/e2e/testcase/apachedubbo/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.apachedubbo;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/BrpcPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/BrpcPluginTest.java
index 95809fea58..bcb9370ae3 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/BrpcPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/BrpcPluginTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.brpc;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -78,8 +79,9 @@ public class BrpcPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynEtcdTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynEtcdTest.java
index a871695684..56ee41dec4 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynEtcdTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynEtcdTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.brpc;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -65,8 +66,9 @@ public class DataSynEtcdTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynHttpTest.java
index 60427c18ab..fa3f81223c 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.brpc;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -63,8 +64,9 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynNacosTest.java
index 126ec91321..71d961af54 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.brpc;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -64,8 +65,9 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynZookeeperTest.java
index 11bea2e952..94bf30435b 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/java/org/apache/shenyu/e2e/testcase/brpc/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.brpc;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -63,8 +64,9 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<MetaData> metaDataCacheList = gatewayClient.getMetaDataCache();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
List<RuleCacheData> ruleCacheList = gatewayClient.getRuleCache();
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynEtcdTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynEtcdTest.java
index c165baa0b6..86e8c260cf 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynEtcdTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynEtcdTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.motan;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -65,8 +66,9 @@ public class DataSynEtcdTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
index abd4136262..0b3811ae8e 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.motan;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
index e75e0c2264..27fdcd1a2e 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.motan;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,8 +68,9 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
index 7f1ef95bfa..cdef45d80e 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.motan;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,8 +67,9 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
index b229fd93f7..c58401eb3e 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-motan/src/test/java/org/apache/shenyu/e2e/testcase/motan/MotanPluginTest.java
@@ -20,6 +20,7 @@ package org.apache.shenyu.e2e.testcase.motan;
import com.fasterxml.jackson.core.JsonProcessingException;
import io.restassured.RestAssured;
import io.restassured.parsing.Parser;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -80,8 +81,9 @@ public class MotanPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
index 8050b730c2..2b4e4af9f1 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.sofa;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,7 +67,7 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
index a2c2b10df0..0b5c5080e9 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.sofa;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,7 +68,7 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
index ebc6ff5ea1..85b9bc2e5f 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.sofa;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -66,7 +67,7 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
index 7371622e5d..0b70702e6f 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/java/org/apache/shenyu/e2e/testcase/sofa/SofaPluginTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.sofa;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -78,7 +79,7 @@ public class SofaPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynEtcdTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynEtcdTest.java
index 41a7bd8925..76201d3238 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynEtcdTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynEtcdTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.springcloud;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -65,8 +66,7 @@ public class DataSynEtcdTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
- adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
index fd4a672b52..ab5df42d42 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynHttpTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.springcloud;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,8 +68,9 @@ public class DataSynHttpTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
index 1f609e2952..fda3f08542 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynNacosTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.springcloud;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -68,8 +69,9 @@ public class DataSynNacosTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
index f5ee347cfe..cc32f47913 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/DataSynZookeeperTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.springcloud;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuTest;
@@ -67,8 +68,9 @@ public class DataSynZookeeperTest {
@Test
void testDataSyn(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
diff --git
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
index d4e5b00564..30e246b0bb 100644
---
a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
+++
b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-spring-cloud/src/test/java/org/apache/shenyu/e2e/testcase/springcloud/SpringCloudPluginTest.java
@@ -18,6 +18,7 @@
package org.apache.shenyu.e2e.testcase.springcloud;
import com.fasterxml.jackson.core.JsonProcessingException;
+import org.apache.shenyu.e2e.client.WaitDataSync;
import org.apache.shenyu.e2e.client.admin.AdminClient;
import org.apache.shenyu.e2e.client.gateway.GatewayClient;
import org.apache.shenyu.e2e.engine.annotation.ShenYuScenario;
@@ -71,8 +72,9 @@ public class SpringCloudPluginTest {
@BeforeAll
static void setup(final AdminClient adminClient, final GatewayClient
gatewayClient) throws InterruptedException, JsonProcessingException {
adminClient.login();
- Thread.sleep(10000);
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
adminClient.syncPluginAll();
+ WaitDataSync.waitAdmin2GatewayDataSync(adminClient, gatewayClient);
List<SelectorDTO> selectorDTOList = adminClient.listAllSelectors();
List<SelectorCacheData> selectorCacheList =
gatewayClient.getSelectorCache();
Assertions.assertEquals(selectorDTOList.size(),
selectorCacheList.size());
