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

integration-cli: fix test to use busybox outside container #10799

Merged
merged 1 commit into from Feb 14, 2015

Conversation

Projects
None yet
4 participants
@ahmetb
Contributor

ahmetb commented Feb 14, 2015

Fixes TestRmiForceWithExistingContainers test to make it use
busybox image rather than /docker-busybox hardcoded path
and rebuilding image.

TestRmiForceWithExistingContainers uses downloaded
/docker-busybox to build the image offline without networking.

For cases where test needs to run outside docker containers
(e.g. windows CI) it is okay for now to make network requests.
In that case, test now uses busybox image (or pull it first).

This fixes the test without changing in-container behavior.

Signed-off-by: Ahmet Alp Balkan ahmetalpbalkan@gmail.com
cc: @jfrazelle @duglin @unclejack @tianon @icecrime

@tianon

This comment has been minimized.

Member

tianon commented Feb 14, 2015

IMO, we should update this test to instead just docker run -d busybox true, docker commit <container>, then use that image to run and thus test docker rmi -f (since we just need an image we can delete safely).

We really shouldn't be embedding /docker-busybox in the test itself at all, IMO.

@tianon

This comment has been minimized.

Member

tianon commented Feb 14, 2015

(or in any test, for that matter)

@tianon

This comment has been minimized.

Member

tianon commented Feb 14, 2015

Even slicker solution. Nice and simple; love it! ❤️

LGTM

@ahmetb

This comment has been minimized.

Contributor

ahmetb commented Feb 14, 2015

Changed test to just use busybox. I didn't realize docker-busybox was tagged as busybox already. Thanks for suggestion.

integration-cli: fix test to use busybox outside container
Fixes TestRmiForceWithExistingContainers test to make it use
`busybox` image rather than /docker-busybox hardcoded path
and rebuilding image.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
@tianon

This comment has been minimized.

Member

tianon commented Feb 14, 2015

LGTM 👍

@tiborvass

This comment has been minimized.

Collaborator

tiborvass commented Feb 14, 2015

LGTM

tiborvass added a commit that referenced this pull request Feb 14, 2015

Merge pull request #10799 from ahmetalpbalkan/win-cli/TestRmiForceWit…
…hExistingContainers-fix

integration-cli: fix test to use busybox outside container

@tiborvass tiborvass merged commit c33ac60 into moby:master Feb 14, 2015

1 check passed

janky Jenkins build Docker-PRs 1091 has succeeded
Details

@ahmetb ahmetb deleted the ahmetb:win-cli/TestRmiForceWithExistingContainers-fix branch Feb 14, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment