-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Conversation
Re-kicking the windows test, failed with a weird error:
Possibly related to this:
|
…i` instead of `rmi -f` Because now the cli will always return 0 for `rmi -f`. Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Because now the cli will always return 0 for `rmi -f`. Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
…TestUpdateWithNanoCPUs Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
To fix tests: - DockerSwarmSuite.TestSwarmNetworkPluginV2 - DockerSwarmSuite.TestServiceLogs Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for tracking these down
out, _, err := dockerCmdWithError("rmi", "-f", imgID) | ||
// rmi -f should not delete image with running containers | ||
out, _, err := dockerCmdWithError("rmi", imgID) | ||
// rmi should not delete image with running containers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we're interested in preserving the intent of this test I think the correct change is to check that this text is in stderr, but there is no error. It should continue to use -f
@@ -243,7 +243,7 @@ func (s *DockerSuite) TestRmiContainerImageNotFound(c *check.C) { | |||
dockerCmd(c, "rmi", "-f", imageIds[1]) | |||
|
|||
// Try to remove the image of the running container and see if it fails as expected. | |||
out, _, err := dockerCmdWithError("rmi", "-f", imageIds[0]) | |||
out, _, err := dockerCmdWithError("rmi", imageIds[0]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same here
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
looks like @tiborvass's fix works |
I think the test fixes for I opened docker/cli#394 to track the problem. I can prepare a revert commit of you agree. |
LGTM |
no longer needed because 17.07 is eol |
Merged with https://github.com/seemethere/unir Upstream-commit: ecfdd4c Component: packaging
[18.09] libcontainerd: prevent exec delete locking Upstream-commit: 484a3c3ad0fdb59ab9bb83ef2ff79184e216313f Component: engine
Fixes the following tests:
Punting on:
Test verified by compiling cli from docker-ce 17.07 branch and using that when running test-integration-cli test from engine component of docker-ce 17.07 branch, e.g.