Add retry for the sql test (apache#9010)

*Motivation* Using await until for retrying the condition check.
liangyali · Dec 23, 2020 · d3e39a7 · d3e39a7
1 parent 98bf97e
commit d3e39a7
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 17 deletions.
diff --git a/.github/workflows/ci-integration-sql.yaml b/.github/workflows/ci-integration-sql.yaml
@@ -95,4 +95,4 @@ jobs:
 
       - name: run integration tests
         if: steps.docs.outputs.changed_only == 'no'
-        run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-sql.xml -DintegrationTests -DredirectTestOutputToFile=false
+        run: mvn -B -f tests/pom.xml test -DintegrationTestSuiteFile=pulsar-sql.xml -DintegrationTests -DredirectTestOutputToFile=false -DtestForkCount=1
diff --git a/...integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java b/...integration/src/test/java/org/apache/pulsar/tests/integration/presto/TestBasicPresto.java
@@ -30,6 +30,7 @@
 import org.apache.pulsar.tests.integration.suites.PulsarTestSuite;
 import org.apache.pulsar.tests.integration.topologies.PulsarCluster;
 import org.apache.pulsar.tests.integration.topologies.PulsarClusterSpec;
+import org.awaitility.Awaitility;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeClass;
@@ -129,23 +130,30 @@ public void testSimpleSQLQuery(boolean isBatched) throws Exception {
                 "/bin/bash",
                 "-c", "bin/pulsar-admin namespaces unload public/default");
 
-        result = execQuery("show tables in pulsar.\"public/default\";");
-        assertThat(result.getExitCode()).isEqualTo(0);
-        assertThat(result.getStdout()).contains("stocks");
-
-        ContainerExecResult containerExecResult = execQuery(String.format("select * from pulsar.\"public/default\".%s order by entryid;", stocksTopic));
-        assertThat(containerExecResult.getExitCode()).isEqualTo(0);
-        log.info("select sql query output \n{}", containerExecResult.getStdout());
-        String[] split = containerExecResult.getStdout().split("\n");
-        assertThat(split.length).isEqualTo(NUM_OF_STOCKS);
-
-        String[] split2 = containerExecResult.getStdout().split("\n|,");
+        Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(
+            () -> {
+                ContainerExecResult r = execQuery("show tables in pulsar.\"public/default\";");
+                assertThat(r.getExitCode()).isEqualTo(0);
+                assertThat(r.getStdout()).contains("stocks");
+            }
+        );
+
+        Awaitility.await().atMost(10, TimeUnit.SECONDS).untilAsserted(
+            () -> {
+                ContainerExecResult containerExecResult = execQuery(String.format("select * from pulsar.\"public/default\".%s order by entryid;", stocksTopic));
+                assertThat(containerExecResult.getExitCode()).isEqualTo(0);
+                log.info("select sql query output \n{}", containerExecResult.getStdout());
+                String[] split = containerExecResult.getStdout().split("\n");
+                assertThat(split.length).isEqualTo(NUM_OF_STOCKS);
+                String[] split2 = containerExecResult.getStdout().split("\n|,");
+                for (int i = 0; i < NUM_OF_STOCKS; ++i) {
+                    assertThat(split2).contains("\"" + i + "\"");
+                    assertThat(split2).contains("\"" + "STOCK_" + i + "\"");
+                    assertThat(split2).contains("\"" + (100.0 + i * 10) + "\"");
+                }
+            }
+        );
 
-        for (int i = 0; i < NUM_OF_STOCKS; ++i) {
-            assertThat(split2).contains("\"" + i + "\"");
-            assertThat(split2).contains("\"" + "STOCK_" + i + "\"");
-            assertThat(split2).contains("\"" + (100.0 + i * 10) + "\"");
-        }
 
         // test predicate pushdown