This repository was archived by the owner on Oct 13, 2023. It is now read-only.
WIP fix tests part deux#180
Closed
andrewhsu wants to merge 7 commits into
Closed
Conversation
…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>
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
thaJeztah
reviewed
Aug 5, 2017
|
|
||
| out, _, err := dockerCmdWithError("rmi", "-f", imgID) | ||
| // rmi -f should not delete image with running containers | ||
| out, _, err := dockerCmdWithError("rmi", imgID) |
Member
There was a problem hiding this comment.
This is actually a bug; the change was too wide; see docker/cli#394
(pull request to fix is here: docker/cli#418)
thaJeztah
reviewed
Aug 5, 2017
|
|
||
| // 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]) |
thaJeztah
reviewed
Aug 5, 2017
| c.Assert(out, checker.Contains, name2+".2") | ||
| c.Assert(out, checker.Contains, name2+".3") | ||
| c.Assert(err, checker.NotNil) | ||
| c.Assert(out, checker.Contains, "no such service: to") |
Member
There was a problem hiding this comment.
Alternatively, use the test I wrote at the time of the PR, but which could not be merged upstream due to not being able to update the CLI; moby/moby@4242aec
That test also verifies the new behaviour
thaJeztah
reviewed
Aug 5, 2017
| if resp.StatusCode != http.StatusSwitchingProtocols { | ||
| resp.Body.Close() | ||
| return nil, fmt.Errorf("unable to upgrade to %s, received %d", proto, resp.StatusCode) | ||
| if err != httputil.ErrPersistEOF { |
Member
There was a problem hiding this comment.
Perhaps this should be separate from the other changes; this is a back port of moby/moby@7a53991 (moby/moby#34275) - "Fix panic in hijack"
Contributor
Author
|
no longer needed, because 17.07 is eol |
docker-jenkins
pushed a commit
that referenced
this pull request
Sep 4, 2018
Merged with https://github.com/seemethere/unir Upstream-commit: 17050de Component: packaging
docker-jenkins
pushed a commit
that referenced
this pull request
Mar 28, 2019
…stemd_resolved [18.09 backport] Fix: network=host using wrong resolv.conf with systemd-resolved Upstream-commit: 80e10316cd01832a0fe04bc7970569bf86c3e391 Component: engine
akrasnov-drv
pushed a commit
to drivenets/docker-ce
that referenced
this pull request
Apr 23, 2023
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
No description provided.