Reduce runtime of long-running S2S unit tests (and fix OF-2942 as a byproduct) #2644
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
guusdk
force-pushed
the
tests-improve-speed
branch
2 times, most recently
from
65bc760 to
df53aea
Compare
guusdk
force-pushed
the
tests-improve-speed
branch
2 times, most recently
from
aa53f85 to
5fef848
Compare
guusdk
changed the title
No functional changes to the unit tests, but adds a simple mechanism to record how much time passed between logged statements.
By properly detecting a stream error, the test needs not to wait for proper session teardown.
This test uses an older SocketAcceptor, that cannot be interrupted. This means that we wait until SO_TIMEOUT before the test ends. This commit reduces the SO_TIMEOUT value. This runs the risk of introducing instability.
This test uses an older SocketAcceptor, that cannot be interrupted. This means that we wait until SO_TIMEOUT before the test ends. This commit reduces the SO_TIMEOUT value. This runs the risk of introducing instability.
…nTest Both tests use a ServerSocket that is 'slow' to shut down. By explicitly closing it, it shuts down faster, improving the duration of the test fixture teardown.
The test teardown waits for inbound stream IDs to be registered with the session manager. Many streams (those that have errored out or have been replaced with an encrypted stream) won't ever be registered in the Session Manager. The test teardown doesn't need to wait for those. This commit introduces a change that tracks the streams that are still in-flight. Test teardown will now only wait for those.
Abort outbound server-to-server attempts immediately (rather than waiting for a timeout), when: - the remote peer requires encryption, but the local server cannot do encryption - authentication mechanisms are exhausted (eg: no client cert for EXTERNAL, and Dialback unavailable)
guusdk
force-pushed
the
tests-improve-speed
branch
from
5fef848 to
a340aa9
Compare
akrherz
approved these changes
Jan 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The unit tests that verify s2s behavior take a long time to execute. The changes in this PR reduce that time (significantly).
This is mostly achieved by changes to the test code. Also, one improvement in Openfire itself is provided: it no longer waits for a timeout on certain irrecoverable outbound s2s failures (OF-2942).