Fix flaky TestCassandraConnectorTest

trinodb · Apr 24, 2024 · 84d3dea · 84d3dea
1 parent 373dccf
commit 84d3dea
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/...n/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java b/...n/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraConnectorTest.java
@@ -222,6 +222,13 @@ public void testCharVarcharComparison()
                 .hasMessage("Unsupported type: char(3)");
     }
 
+    @Test
+    @Override // Override because some tests (e.g. testKeyspaceNameAmbiguity) cause table listing failure
+    public void testShowInformationSchemaTables()
+    {
+        executeExclusively(super::testShowInformationSchemaTables);
+    }
+
     @Test
     @Override // Override because some tests (e.g. testKeyspaceNameAmbiguity, testNativeQueryCaseSensitivity) cause column listing failure
     public void testSelectInformationSchemaColumns()
@@ -958,6 +965,9 @@ public void testKeyspaceNameAmbiguity()
 
         session.execute("DROP KEYSPACE \"KeYsPaCe_3\"");
         session.execute("DROP KEYSPACE \"kEySpAcE_3\"");
+        // Wait until the schema becomes invisible to Trino. Otherwise, testSelectInformationSchemaColumns may fail due to ambiguous schema names.
+        assertEventually(() -> assertThat(computeActual("SHOW SCHEMAS FROM cassandra").getOnlyColumnAsSet())
+                .doesNotContain("keyspace_3"));
     }
 
     @Test
@@ -1479,6 +1489,8 @@ public void testNativeQueryCaseSensitivity()
                 "VALUES (1, 2)");
 
         onCassandra("DROP TABLE tpch." + tableName);
+        // Wait until the table becomes invisible to Trino. Otherwise, testSelectInformationSchemaColumns may fail due to ambiguous column names.
+        assertEventually(() -> assertThat(getQueryRunner().tableExists(getSession(), tableName)).isFalse());
     }
 
     @Test