Skip to content

fix(test): fix CachedLDAPAuthorizationModuleLegacyTest flakiness caused by Thread.sleep() #1748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbonofre merged 1 commit into from
Mar 10, 2026
+76 −37
Merged

fix(test): fix CachedLDAPAuthorizationModuleLegacyTest flakiness caused by Thread.sleep() #1748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 76 additions & 37 deletions .../test/java/org/apache/activemq/security/AbstractCachedLDAPAuthorizationMapLegacyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,14 @@ public void testAdvisory() throws Exception {
public void testTemporary() throws Exception {
map.query();

Thread.sleep(1000);
assertTrue("did not get expected temp ACLs", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
Set<?> acls = map.getTempDestinationReadACLs();
return acls != null && acls.size() == 2;
}
}));
Set<?> readACLs = map.getTempDestinationReadACLs();
assertEquals("set size: " + readACLs, 2, readACLs.size());
assertTrue("Contains admin group", readACLs.contains(ADMINS));
assertTrue("Contains users group", readACLs.contains(USERS));
}
Expand All @@ -174,10 +179,12 @@ public void testAdd() throws Exception {

reader.close();

Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("FAILED"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());
assertTrue("did not get expected size after add", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("FAILED")).size() == 2;
}
}));
}

@Test
Expand All @@ -194,10 +201,13 @@ public void testRemove() throws Exception {
}

reader.close();
Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 0, failedACLs.size());
assertTrue("did not get expected size after remove", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 0;
}
}));

assertTrue(map.getTempDestinationReadACLs() == null || map.getTempDestinationReadACLs().isEmpty());
assertTrue(map.getTempDestinationWriteACLs() == null || map.getTempDestinationWriteACLs().isEmpty());
Expand All @@ -215,11 +225,12 @@ public void testRenameDestination() throws Exception {
connection.rename(new Dn("cn=TEST.FOO," + getQueueBaseDn()),
new Rdn("cn=TEST.BAR"));

Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 0, failedACLs.size());

assertTrue("TEST.FOO ACLs not removed after rename", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 0;
}
}));

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.BAR"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());
Expand All @@ -232,21 +243,25 @@ public void testRenamePermission() throws Exception {
// Test for a permission rename
connection.delete(new Dn("cn=Read,cn=TEST.FOO," + getQueueBaseDn()));

Thread.sleep(2000);

Set<?> failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 0, failedACLs.size());
assertTrue("Read ACLs not removed after delete", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 0;
}
}));

failedACLs = map.getWriteACLs(new ActiveMQQueue("TEST.FOO"));
Set<?> failedACLs = map.getWriteACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());

connection.rename(new Dn("cn=Write,cn=TEST.FOO," + getQueueBaseDn()),
new Rdn("cn=Read"));

Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());
assertTrue("Read ACLs not restored after rename", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 2;
}
}));

failedACLs = map.getWriteACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 0, failedACLs.size());
Expand All @@ -268,10 +283,12 @@ public void testChange() throws Exception {

connection.modify(request);

Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 1, failedACLs.size());
assertTrue("Read ACLs not updated after modify", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 1;
}
}));

// Change destination entry
request = new ModifyRequestImpl();
Expand All @@ -280,10 +297,12 @@ public void testChange() throws Exception {

connection.modify(request);

Thread.sleep(2000);

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 1, failedACLs.size());
assertTrue("Read ACLs changed unexpectedly after destination modify", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("TEST.FOO")).size() == 1;
}
}));
}

@Test
Expand Down Expand Up @@ -313,7 +332,7 @@ public void testRestart(final boolean sync) throws Exception {

// wait for the context to be closed
// as we can't rely on ldap server isStarted()
Wait.waitFor(new Wait.Condition() {
assertTrue("Context was not closed after LDAP server stop", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
if (sync) {
Expand All @@ -322,14 +341,34 @@ public boolean isSatisified() throws Exception {
return map.context == null;
}
}
}, 5*60*1000);
}, 5*60*1000));

failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());
// Verify cached ACLs are still available while LDAP is down.
// Avoid calling getReadACLs here in async mode as it triggers
// checkForUpdates which submits an async reconnection task to the
// single-threaded updater. That task blocks on the dead LDAP
// server (TCP connect timeout), preventing later reconnection
// tasks from executing and causing the test to time out.
if (sync) {
failedACLs = map.getReadACLs(new ActiveMQQueue("TEST.FOO"));
assertEquals("set size: " + failedACLs, 2, failedACLs.size());
}

getLdapServer().start();

Thread.sleep(2000);
// Wait for the LDAP server to be fully ready and force a synchronous
// reconnection of the map, re-registering event listeners.
assertTrue("Map did not reconnect to restarted LDAP server", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
try {
map.query();
return true;
} catch (Exception e) {
return false;
}
}
}));

connection = getLdapConnection();

Expand All @@ -347,7 +386,7 @@ public boolean isSatisified() throws Exception {
public boolean isSatisified() throws Exception {
return map.getReadACLs(new ActiveMQQueue("FAILED")).size() == 2;
}
}, 5*60*1000));
}));
}

protected SimpleCachedLDAPAuthorizationMap createMap() {
Expand Down