TestLinksEtcHostsContentMatch: use container.Exec() #36569
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
I am not quite sure why but this test is sometimes failing like this: > 15:21:41 --- FAIL: TestLinksEtcHostsContentMatch (0.53s) > 15:21:41 assertions.go:226: > > Error Trace: links_linux_test.go:46 > 15:21:41 > Error: Not equal: > 15:21:41 > expected: "127.0.0.1\tlocalhost\n::1\tlocalhost > ip6-localhost > ip6-loopback\nfe00::0\tip6-localnet\nff00::0\tip6-mcastprefix\nff02::1\tip6-allnodes\nff02::2\tip6-allrouters\n172.17.0.2\tf53feb6df161\n" > 15:21:41 > received: "" To eliminate some possible failures (like ignoring stderr from `cat` or its exit code), let's use container.Exec() to read a file from a container. Fixes: e6bd20e ("Migrate some integration-cli test to api tests") Signed-off-by: Kir Kolyshkin <[email protected]>
|
@yongtang PTAL |
yongtang
reviewed
Mar 13, 2018
|
|
||
| var b bytes.Buffer | ||
| _, err = stdcopy.StdCopy(&b, ioutil.Discard, body) | ||
| cID := container.Run(t, ctx, client, container.WithNetworkMode("host")) |
There was a problem hiding this comment.
Maybe we could add
poll.WaitOn(t, container.IsInState(ctx, client, cID, "running"), poll.WithDelay(100*time.Millisecond))
so that to make sure the container is running?
There was a problem hiding this comment.
It looks like such a check is redundant.
As far as I can see from the source code, container.Run() is synchronous operation, i.e. a successful return from container.Run() means the container is running (and its status is set to running)
Surely, a container can exit in between calls to container.Run() and container.Exec(), but there's no need to check for that either, as this is done in Exec().
thaJeztah
approved these changes
Mar 13, 2018
|
Windows is failing on another flaky test (being worked on in #36571), but otherwise green; |
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.
I am not quite sure why but this test is sometimes failing like this:
To eliminate some possible failures (like ignoring stderr from
cator its exit code), let's use container.Exec() to read a file from a container.