Skip to content

[TEST] Wait for async LDAP search to finish #81197

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
elasticsearchmachine merged 2 commits into from
Dec 2, 2021
Merged

[TEST] Wait for async LDAP search to finish #81197

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
779f909
[TEST] Wait for async LDAP search to finish
tvernum Dec 1, 2021
9ab6759
Increase timeout while waiting
tvernum Dec 2, 2021
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
6 changes: 6 additions & 0 deletions ...t/java/org/elasticsearch/xpack/security/authc/ldap/SearchGroupsResolverInMemoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@

import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

import static org.elasticsearch.xpack.core.security.authc.RealmSettings.getFullSettingKey;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.iterableWithSize;
import static org.hamcrest.Matchers.lessThanOrEqualTo;

public class SearchGroupsResolverInMemoryTests extends LdapTestCase {

Expand Down Expand Up @@ -77,6 +79,10 @@ public void testSearchTimeoutIsFailure() throws Exception {
assertThat(((LDAPException) cause).getResultCode(), is(ResultCode.TIMEOUT));
} finally {
ldapServers[0].setProcessingDelayMillis(0);

// Wait for the async search to complete or timeout.
// Without this, we might trigger an orphaned thread - see https://github.com/pingidentity/ldapsdk/issues/120
assertBusy(() -> assertThat(connection.getActiveOperationCount(), lessThanOrEqualTo(0)), 1000, TimeUnit.MILLISECONDS);
}
}

Expand Down