Joda-Time branch - Fix failing licence test #36482
Merged
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
|
Pinging @elastic/es-core-infra |
spinscale
suggested changes
Dec 11, 2018
| @@ -35,7 +37,7 @@ | |||
| public static final String PUBLIC_KEY_RESOURCE = "/public.key"; | |||
| public static final String PRIVATE_KEY_RESOURCE = "/private.key"; | |||
|
|
|||
| private static final DateFormatter dateFormatter = DateFormatters.forPattern("yyyy-MM-dd"); | |||
| private static final DateFormatter dateFormatter = DateFormatters.forPattern("yyyy-MM-dd").withZone(ZoneId.systemDefault()); | |||
There was a problem hiding this comment.
let's use ZoneOffset.UTC here to have stable tests among all developers across the world
the test is using System.currentMilliseconds and then tries to format this. Adding default system zoneId to formatter will make the test pass
spinscale
suggested changes
Dec 11, 2018
| @@ -49,7 +51,7 @@ public static String dumpLicense(License license) throws Exception { | |||
| } | |||
|
|
|||
| public static String dateMathString(String time, final long now) { | |||
| return dateFormatter.format(dateMathParser.parse(time, () -> now)); | |||
| return dateFormatter.format(dateMathParser.parse(time, () -> now).atZone(ZoneId.systemDefault())); | |||
spinscale
approved these changes
Dec 11, 2018
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 test is using System.currentMilliseconds and then tries to format
this. Adding default system zoneId to formatter will make the test pass