This is an automated email from the ASF dual-hosted git repository.
konstantinov pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1f220921dc Fix flakiness of AuditLoggerAuthTest and CQLUserAuditTest
by awaiting of default superuser role creation
1f220921dc is described below
commit 1f220921dc28ac0781db0a630411ff28a7833fcf
Author: Dmitry Konstantinov <[email protected]>
AuthorDate: Sun Feb 1 12:06:05 2026 +0000
Fix flakiness of AuditLoggerAuthTest and CQLUserAuditTest by awaiting of
default superuser role creation
patch by Dmitry Konstantinov; reviewed by Michael Semb Wever for
CASSANDRA-19165
---
.../cassandra/audit/AuditLoggerAuthTest.java | 4 ++++
.../cassandra/transport/CQLUserAuditTest.java | 26 +++++++++++++---------
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java
b/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java
index 33856d9ed6..8c56ee8406 100644
--- a/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java
+++ b/test/unit/org/apache/cassandra/audit/AuditLoggerAuthTest.java
@@ -36,6 +36,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.apache.cassandra.ServerTestUtils;
+import org.apache.cassandra.auth.AuthTestUtils;
import org.apache.cassandra.auth.CassandraAuthorizer;
import org.apache.cassandra.auth.CassandraRoleManager;
import org.apache.cassandra.auth.PasswordAuthenticator;
@@ -82,6 +83,7 @@ public class AuditLoggerAuthTest
SUPERUSER_SETUP_DELAY_MS.setLong(0);
embedded = ServerTestUtils.startEmbeddedCassandraService();
+ AuthTestUtils.waitForExistingRoles();
executeWithCredentials(
Arrays.asList(getCreateRoleCql(TEST_USER, true, false, false),
@@ -368,6 +370,8 @@ public class AuditLoggerAuthTest
}
catch (AuthenticationException e)
{
+ if (expectedType == null)
+ throw e;
authFailed = true;
}
catch (UnauthorizedException ue)
diff --git a/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java
b/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java
index e0b3b24d8d..04c648e0a8 100644
--- a/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java
+++ b/test/unit/org/apache/cassandra/transport/CQLUserAuditTest.java
@@ -44,6 +44,7 @@ import org.apache.cassandra.audit.AuditEvent;
import org.apache.cassandra.audit.AuditLogEntryType;
import org.apache.cassandra.audit.AuditLogManager;
import org.apache.cassandra.audit.DiagnosticEventAuditLogger;
+import org.apache.cassandra.auth.AuthTestUtils;
import org.apache.cassandra.auth.CassandraRoleManager;
import org.apache.cassandra.auth.PasswordAuthenticator;
import org.apache.cassandra.config.DatabaseDescriptor;
@@ -78,6 +79,8 @@ public class CQLUserAuditTest
SUPERUSER_SETUP_DELAY_MS.setLong(0);
embedded = ServerTestUtils.startEmbeddedCassandraService();
+ AuthTestUtils.waitForExistingRoles();
+
executeAs(Arrays.asList("CREATE ROLE testuser WITH LOGIN = true AND
SUPERUSER = false AND PASSWORD = 'foo'",
"CREATE ROLE testuser_nologin WITH LOGIN =
false AND SUPERUSER = false AND PASSWORD = 'foo'",
@@ -214,20 +217,23 @@ public class CQLUserAuditTest
AuditLogEntryType
expectedAuthType) throws Exception
{
boolean authFailed = false;
- Cluster cluster =
Cluster.builder().addContactPoints(InetAddress.getLoopbackAddress())
+ try(Cluster cluster =
Cluster.builder().addContactPoints(InetAddress.getLoopbackAddress())
.withoutJMXReporting()
.withCredentials(username, password)
-
.withPort(DatabaseDescriptor.getNativeTransportPort()).build();
- try (Session session = cluster.connect())
- {
- for (String query : queries)
- session.execute(query);
- }
- catch (AuthenticationException e)
+
.withPort(DatabaseDescriptor.getNativeTransportPort()).build())
{
- authFailed = true;
+ try (Session session = cluster.connect())
+ {
+ for (String query : queries)
+ session.execute(query);
+ }
+ catch (AuthenticationException e)
+ {
+ if (expectedAuthType == null)
+ throw e;
+ authFailed = true;
+ }
}
- cluster.close();
if (expectedAuthType == null) return null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
