Skip to content

Fix unstable LDAP connection tests #105

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

Closed
pavelhoral wants to merge 1 commit into from
Closed

Fix unstable LDAP connection tests #105

Show file tree
Hide file tree
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
58 changes: 29 additions & 29 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,32 +23,32 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Run the Maven verify phase
run: mvn -B verify -Dclirr.skip
- name: Test setup
run: |
opendj-server-legacy/target/package/wrends/setup \
--cli \
--backendType je \
--baseDN dc=example,dc=com \
--sampleData 200 \
--ldapPort 1389 \
--adminConnectorPort 4444 \
--rootUserDN "cn=Directory Manager" \
--rootUserPassword password \
--no-prompt \
--noPropertiesFile
- name: Test status
run: |
opendj-server-legacy/target/package/wrends/bin/status \
--bindDN "cn=Directory Manager" \
--bindPassword password \
> /tmp/wrends-status.txt
grep -q "Server Run Status:\s\+Started" /tmp/wrends-status.txt
grep -q "Entries:\s\+202" /tmp/wrends-status.txt
- name: Test ldapsearch
run: |
opendj-server-legacy/target/package/wrends/bin/ldapsearch \
--port 1389 \
--baseDN dc=example,dc=com \
"(uid=user.0)" | \
grep -q "dn: uid=user.0,ou=People,dc=example,dc=com"
run: mvn -B verify -Dclirr.skip -DignoreArtifactSigs -Dtest='ConnectionFactoryTestCase#testCloseNotify' -Dsurefire.failIfNoSpecifiedTests=false
# - name: Test setup
# run: |
# opendj-server-legacy/target/package/wrends/setup \
# --cli \
# --backendType je \
# --baseDN dc=example,dc=com \
# --sampleData 200 \
# --ldapPort 1389 \
# --adminConnectorPort 4444 \
# --rootUserDN "cn=Directory Manager" \
# --rootUserPassword password \
# --no-prompt \
# --noPropertiesFile
# - name: Test status
# run: |
# opendj-server-legacy/target/package/wrends/bin/status \
# --bindDN "cn=Directory Manager" \
# --bindPassword password \
# > /tmp/wrends-status.txt
# grep -q "Server Run Status:\s\+Started" /tmp/wrends-status.txt
# grep -q "Entries:\s\+202" /tmp/wrends-status.txt
# - name: Test ldapsearch
# run: |
# opendj-server-legacy/target/package/wrends/bin/ldapsearch \
# --port 1389 \
# --baseDN dc=example,dc=com \
# "(uid=user.0)" | \
# grep -q "dn: uid=user.0,ou=People,dc=example,dc=com"
1 change: 1 addition & 0 deletions opendj-grizzly/src/main/java/org/forgerock/opendj/grizzly/LDAPServerFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ public void exceptionOccurred(final FilterChainContext ctx, final Throwable erro

@Override
public NextAction handleClose(final FilterChainContext ctx) {
System.out.println("TEST HANDLE CLOSE: " + Thread.currentThread());
isClosed = true;
// downstream can be null if the connection is closed before handleAccept() completion.
final GrizzlyBackpressureSubscription immutableRef = downstream;
Expand Down
24 changes: 13 additions & 11 deletions opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,17 +499,17 @@ Object[][] closeNotifyConfig() {
return new Object[][] {
// closeOnAccept, doBindFirst, useEventListener, sendDisconnectNotification

// Close on accept.
{ new CloseNotify(true, false, false, false) },
{ new CloseNotify(true, false, true, false) },

// Use disconnect.
{ new CloseNotify(false, false, false, false) },
{ new CloseNotify(false, false, false, true) },
{ new CloseNotify(false, false, true, false) },
{ new CloseNotify(false, false, true, true) },
{ new CloseNotify(false, true, false, false) },
{ new CloseNotify(false, true, false, true) },
// // Close on accept.
// { new CloseNotify(true, false, false, false) },
// { new CloseNotify(true, false, true, false) },
//
// // Use disconnect.
// { new CloseNotify(false, false, false, false) },
// { new CloseNotify(false, false, false, true) },
// { new CloseNotify(false, false, true, false) },
// { new CloseNotify(false, false, true, true) },
// { new CloseNotify(false, true, false, false) },
// { new CloseNotify(false, true, false, true) },
{ new CloseNotify(false, true, true, false) },
{ new CloseNotify(false, true, true, true) },
};
Expand Down Expand Up @@ -578,11 +578,13 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
LDAPClientContext context = contextHolder.get();
assertThat(context).isNotNull();
assertThat(context.isClosed()).isFalse();
System.out.println("TEST BEFORE: " + Thread.currentThread());
if (config.sendDisconnectNotification) {
context.disconnect(ResultCode.BUSY, "busy");
} else {
context.disconnect();
}
System.out.println("TEST AFTER: " + Thread.currentThread());
assertThat(context.isClosed()).isTrue();
}
// Block until remote close is signalled.
Expand Down