Skip to content

Fix testTokenExpiry flaky test #42585

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
merged 2 commits into from
May 30, 2019
Merged

Fix testTokenExpiry flaky test #42585

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a861df8
Fix testTokenExpiry flaky test
jkakavas May 27, 2019
759dcac
simplify test
jkakavas May 28, 2019
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
5 changes: 2 additions & 3 deletions ...ugin/security/src/test/java/org/elasticsearch/xpack/security/authc/TokenServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,9 +530,8 @@ public void testTokenExpiry() throws Exception {
}

try (ThreadContext.StoredContext ignore = requestContext.newStoredContext(true)) {
// move to expiry
clock.fastForwardSeconds(Math.toIntExact(defaultExpiration.getSeconds()) - fastForwardAmount);
clock.rewind(TimeValue.timeValueNanos(clock.instant().getNano())); // trim off nanoseconds since don't store them in the index
// move to expiry, stripping nanoseconds, as we don't store them in the security-tokens index
clock.setTime(userToken.getExpirationTime().truncatedTo(ChronoUnit.MILLIS).atZone(clock.getZone()));
PlainActionFuture<UserToken> future = new PlainActionFuture<>();
tokenService.getAndValidateToken(requestContext, future);
assertAuthentication(authentication, future.get().getAuthentication());
Expand Down