[shardingsphere] branch master updated: Use Awaitility replace Unreliables at E2E (#28111)

[zhonghongsheng]

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

zhonghongsheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new e05cae6c215 Use Awaitility replace Unreliables at E2E (#28111)
e05cae6c215 is described below

commit e05cae6c21503f2e48476f9a92ed6e639e678ca8
Author: Xinze Guo <101622833+aze...@users.noreply.github.com>
AuthorDate: Wed Aug 16 20:29:43 2023 +0800

    Use Awaitility replace Unreliables at E2E (#28111)
    
    * Use Awaitility replace Unreliables
    
    * Remove unused code
    
    * Add ignoredExceptions
    
    * use check connection replace mockRateLimiter
    
    * Remove exception catch
---
 .../container/wait/JdbcConnectionWaitStrategy.java   | 20 +++++++-------------
 .../scenario/primary_key/text_primary_key/mysql.xml  |  8 --------
 .../primary_key/text_primary_key/postgresql.xml      |  8 --------
 3 files changed, 7 insertions(+), 29 deletions(-)

diff --git 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
index 1b5d4130c95..a989341858a 100644
--- 
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
+++ 
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/wait/JdbcConnectionWaitStrategy.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.e2e.env.container.wait;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.rnorth.ducttape.unreliables.Unreliables;
 import org.testcontainers.containers.wait.strategy.AbstractWaitStrategy;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
 
 import java.sql.Connection;
 import java.util.concurrent.Callable;
@@ -37,19 +37,13 @@ public final class JdbcConnectionWaitStrategy extends 
AbstractWaitStrategy {
     
     @Override
     protected void waitUntilReady() {
-        Unreliables.retryUntilSuccess((int) startupTimeout.getSeconds(), 
TimeUnit.SECONDS, this::mockRateLimiter);
+        
Awaitility.await().ignoreExceptions().atMost(startupTimeout.getSeconds(), 
TimeUnit.SECONDS).pollInterval(1L, 
TimeUnit.SECONDS).until(this::checkConnection);
     }
     
-    private boolean mockRateLimiter() {
-        getRateLimiter().doWhenReady(() -> {
-            try (Connection ignored = connectionSupplier.call()) {
-                log.info("Container ready.");
-                // CHECKSTYLE:OFF
-            } catch (final Exception ex) {
-                // CHECKSTYLE:ON
-                throw new RuntimeException("Not Ready yet.", ex);
-            }
-        });
-        return true;
+    private boolean checkConnection() throws Exception {
+        try (Connection ignored = connectionSupplier.call()) {
+            log.info("Container ready.");
+            return true;
+        }
     }
 }
diff --git 
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
 
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
index b1376db0482..0ba33d184cf 100644
--- 
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
+++ 
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/mysql.xml
@@ -25,12 +25,4 @@
         INDEX ( `user_id` )
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
     </create-table-order>
-
-    <update-table-order-status>
-        UPDATE t_order SET status= 'unlock'
-    </update-table-order-status>
-
-    <create-index-status>
-        CREATE index idx_order_status ON t_order (status)
-    </create-index-status>
 </command>
diff --git 
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
 
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
index d9e77eb6f54..c00b3d80ec0 100644
--- 
a/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
+++ 
b/test/e2e/operation/pipeline/src/test/resources/env/scenario/primary_key/text_primary_key/postgresql.xml
@@ -23,12 +23,4 @@
         PRIMARY KEY (order_id)
         )
     </create-table-order>
-    
-    <update-table-order-status>
-        UPDATE t_order SET status= 'unlock'
-    </update-table-order-status>
-    
-    <create-index-status>
-        CREATE INDEX "idx_user_status" ON t_order ( status )
-    </create-index-status>
 </command>