Skip to content

Fix flaky BindOperationTestCase subtree auth-info tests #727

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
vharseko merged 1 commit into from
Jul 11, 2026
Merged

Fix flaky BindOperationTestCase subtree auth-info tests #727

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
41 changes: 37 additions & 4 deletions opendj-server-legacy/src/test/java/org/opends/server/core/BindOperationTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,11 @@
import org.opends.server.types.Control;
import org.opends.server.types.Operation;
import org.opends.server.types.OperationType;
import org.opends.server.util.TestTimer;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;

import static java.util.concurrent.TimeUnit.*;
import static org.assertj.core.api.Assertions.*;
import static org.forgerock.opendj.ldap.ModificationType.*;
import static org.forgerock.opendj.ldap.requests.Requests.*;
Expand Down Expand Up @@ -1527,7 +1529,16 @@ public void testSubtreeDeleteClearsAuthInfo()
};
assertEquals(LDAPDelete.run(nullPrintStream(), System.err, args), 0);

assertNull(DirectoryServer.getAuthenticatedUsers().get(userDN));
// AuthenticatedUsers is a POST_RESPONSE plugin: the registry is updated
// after the client already received the response, so poll briefly.
newAuthInfoTimer().repeatUntilSuccess(new TestTimer.CallableVoid()
{
@Override
public void call() throws Exception
{
assertNull(DirectoryServer.getAuthenticatedUsers().get(userDN));
}
});
}
finally
{
Expand Down Expand Up @@ -1591,16 +1602,38 @@ public void testSubtreeModifyUpdatesAuthInfo()
};
assertEquals(LDAPModify.run(nullPrintStream(), System.err, args), 0);

DN newUserDN = DN.valueOf("uid=test,ou=users,dc=example,dc=com");
assertNotNull(DirectoryServer.getAuthenticatedUsers().get(newUserDN));
assertEquals(DirectoryServer.getAuthenticatedUsers().get(newUserDN).size(), 1);
final DN newUserDN = DN.valueOf("uid=test,ou=users,dc=example,dc=com");
// AuthenticatedUsers is a POST_RESPONSE plugin: the registry is updated
// after the client already received the response, so poll briefly.
newAuthInfoTimer().repeatUntilSuccess(new TestTimer.CallableVoid()
{
@Override
public void call() throws Exception
{
assertNotNull(DirectoryServer.getAuthenticatedUsers().get(newUserDN));
assertEquals(DirectoryServer.getAuthenticatedUsers().get(newUserDN).size(), 1);
}
});
}
finally
{
TestCaseUtils.clearBackend("userRoot");
}
}

/**
* Timer to await the asynchronous {@link AuthenticatedUsers} registry
* update: it is performed by a POST_RESPONSE plugin, i.e. after the client
* already received the operation response.
*/
private TestTimer newAuthInfoTimer()
{
return new TestTimer.Builder()
.maxSleep(10, SECONDS)
.sleepTimes(100, MILLISECONDS)
.toTimer();
}

/**
* Tests to ensure that the "ignore" password policy state update policy
* works as expected.
Expand Down
Loading