commit dc6afb0cf37bca3e9fc8749fe349bb564714bb1e
author Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com> Wed Jan 10 13:17:09 2024 -0500
committer Ekaterina Dimitrova <ekaterina.dimitrova@datastax.com> Wed Jan 10 13:22:35 2024 -0500
tree 7648cf69fef83e7d897d4a281e5035d2dd3770c6
parent 3d1b981d8968635660eb015292891e57d1212c2e
parent 290a5990d4ca9d696c490eb717c35d094a23c4cb

Merge branch 'cassandra-4.0' into cassandra-4.1

* cassandra-4.0:
  Fix flaky test org.apache.cassandra.tools.BulkLoaderTest.testBulkLoader_WithArgs1

test/unit/org/apache/cassandra/tools/BulkLoaderTest.java

diff --git a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java
index d909913..be7383c 100644
--- a/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java
+++ b/test/unit/org/apache/cassandra/tools/BulkLoaderTest.java
@@ -93,7 +93,9 @@
                                                         "globalEventExecutor-[1-9]-[1-9]",
                                                         "globalEventExecutor-[1-9]-[1-9]",
                                                         "Shutdown-checker",
-                                                        "cluster[0-9]-connection-reaper-[0-9]" });
+                                                        "cluster[0-9]-connection-reaper-[0-9]",
+                                                        // the driver isn't expected to terminate threads on close synchronously (CASSANDRA-19000)
+                                                        "cluster[0-9]-nio-worker-[0-9]" });
         assertSchemaNotLoaded();
         assertCLSMNotLoaded();
         assertSystemKSNotLoaded();