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.

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

Events CLI tests: fix flakyness of TestEventsOOMDisableTrue #34730

Merged
merged 1 commit into from Sep 7, 2017

Conversation

Projects
None yet
6 participants
@simonferquel
Contributor

simonferquel commented Sep 5, 2017

- What I did
I changed the cleanup code of TestEventsOOMDisableTrue, so that if the container is already removed by the time the defer call is triggered, it does not fail the test
- How I did it
I used dockerCmdWithResult (which let client code choose what to do with the potential command line error) instead of dockerCmd (which fails the test if the command line does not succeed)
- How to verify it
Run the CI :)

Avoid failing the test if container is already stopped
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
@dnephin

dnephin approved these changes Sep 5, 2017

LGTM

@boaz1337

LGTM 👍

@AkihiroSuda

This comment has been minimized.

Show comment
Hide comment
@AkihiroSuda

AkihiroSuda Sep 6, 2017

Member

so that if the container is already removed by the time the defer call is triggered, it does not fail the test

Where are we removing the container?

Member

AkihiroSuda commented Sep 6, 2017

so that if the container is already removed by the time the defer call is triggered, it does not fail the test

Where are we removing the container?

@simonferquel

This comment has been minimized.

Show comment
Hide comment
@simonferquel

simonferquel Sep 6, 2017

Contributor

@AkihiroSuda the container spin on doing x=$x$x$x$x, consuming more and more memory.
his test checks that the oom killer does not take action for 20s, but at some point the process in the container fails to allocate more memory and crashes.

Contributor

simonferquel commented Sep 6, 2017

@AkihiroSuda the container spin on doing x=$x$x$x$x, consuming more and more memory.
his test checks that the oom killer does not take action for 20s, but at some point the process in the container fails to allocate more memory and crashes.

@AkihiroSuda

thanks, LGTM if green

@vdemeester

LGTM 🐸

@vdemeester

This comment has been minimized.

Show comment
Hide comment
@vdemeester

vdemeester Sep 6, 2017

Member

I think windows failures are unrelated 😅

Member

vdemeester commented Sep 6, 2017

I think windows failures are unrelated 😅

@vdemeester vdemeester merged commit 72eb1d0 into moby:master Sep 7, 2017

5 of 6 checks passed

windowsRS1 Jenkins build Docker-PRs-WoW-RS1 16827 has failed
Details
dco-signed All commits are signed
experimental Jenkins build Docker-PRs-experimental 36653 has succeeded
Details
janky Jenkins build Docker-PRs 45284 has succeeded
Details
powerpc Jenkins build Docker-PRs-powerpc 5682 has succeeded
Details
z Jenkins build Docker-PRs-s390x 5465 has succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment