integ-cli: Fix clock skew against remote test daemon#11330
Merged
jessfraz merged 1 commit intomoby:masterfrom Mar 11, 2015
ahmetb:win-cli/events-daemon-time
Merged
integ-cli: Fix clock skew against remote test daemon#11330jessfraz merged 1 commit intomoby:masterfrom ahmetb:win-cli/events-daemon-time
jessfraz merged 1 commit intomoby:masterfrom
ahmetb:win-cli/events-daemon-time
Conversation
This fixes the `docker events`-related tests as they have been failing due to clock skew between CI machine and test daemon on some other machine (even 1-2 seconds of diff causes races as we pass local time to --since/--until). If we're running in same host, we keep using time.Now(), otherwise we read the system time of the daemon from `/info` endpoint. Fixes pretty much all events-related tests on windows CI. Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Contributor
|
OMG Thanks @ahmetalpbalkan and @jfrazelle ! LGTM |
Contributor
|
That's a lot of additional API calls, but I don't see a better alternative. |
Contributor
|
@icecrime only for remote daemons |
Contributor
|
Mmm yes indeed! LGTM. |
Contributor
|
LGTM |
jessfraz
pushed a commit
that referenced
this pull request
Mar 11, 2015
integ-cli: Fix clock skew against remote test daemon
Contributor
Author
|
💖 |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This fixes the
docker events-related tests as they have beenfailing due to clock skew between CI machine and test daemon on
some other machine (even 1-2 seconds of diff causes races as
we use local machine time in --since/--until args).
If we're running in same host, we keep using
time.Now(), otherwisewe read the system time of the daemon from
/infoendpoint, whichis recently added there.
Fixes pretty much all events-related tests on windows CI.
Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @jfrazelle @duglin @LK4D4 @icecrime