Skip to content

bugfix(test): fix flaky ExecutorServiceSessionValidationSchedulerTest… #2820

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

Open
lprimak wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −6
Open

bugfix(test): fix flaky ExecutorServiceSessionValidationSchedulerTest… #2820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1932e6
bugfix(test): fix flaky ExecutorServiceSessionValidationSchedulerTest…
lprimak Jun 29, 2026
abf0da1
enh(codespell): added atMost to dictionary
lprimak Jun 29, 2026
214550c
more codespell
lprimak Jun 29, 2026
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
1 change: 1 addition & 0 deletions .github/linters/codespell.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ afile
afterall
aline
atleast
atmost
bais
bu
crypted
Expand Down
17 changes: 11 additions & 6 deletions ...test/java/org/apache/shiro/session/mgt/ExecutorServiceSessionValidationSchedulerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import java.time.Duration;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;

@SuppressWarnings("checkstyle:MagicNumber")
public class ExecutorServiceSessionValidationSchedulerTest {
Expand All @@ -47,8 +49,9 @@ void timeoutSessionValidate() throws InterruptedException {
Session session = new SimpleSession();
session.setTimeout(2000L);
defaultSessionManager.create(session);
Thread.sleep(5000L);
assertThat(defaultSessionManager.getActiveSessions()).isEmpty();
await().atMost(Duration.ofSeconds(10))
.pollInterval(Duration.ofMillis(100))
.untilAsserted(() -> assertThat(defaultSessionManager.getActiveSessions()).isEmpty());

@steinarb steinarb Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had to read up on awaitatility. Nice!

assertThat(executorServiceSessionValidationScheduler.isEnabled()).isTrue();
}

Expand All @@ -59,8 +62,9 @@ void stopSessionValidate() throws InterruptedException {
defaultSessionManager.create(session);
Thread.sleep(1000L);
session.stop();
Thread.sleep(3000L);
assertThat(defaultSessionManager.getActiveSessions()).isEmpty();
await().atMost(Duration.ofSeconds(10))
.pollInterval(Duration.ofMillis(100))
.untilAsserted(() -> assertThat(defaultSessionManager.getActiveSessions()).isEmpty());
assertThat(executorServiceSessionValidationScheduler.isEnabled()).isTrue();
}

Expand Down Expand Up @@ -88,8 +92,9 @@ void threadException() throws InterruptedException {
defaultSessionManager.create(session);
Thread.sleep(2000L);
session.stop();
Thread.sleep(2000L);
assertThat(defaultSessionManager.getActiveSessions()).isNotEmpty();
await().atMost(Duration.ofSeconds(10))
.pollInterval(Duration.ofMillis(100))
.untilAsserted(() -> assertThat(defaultSessionManager.getActiveSessions()).isNotEmpty());
assertThat(executorServiceSessionValidationScheduler.isEnabled()).isTrue();
}

Expand Down
Loading