This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[17.10] Fix tests for 17.10 release#260
Merged
andrewhsu merged 6 commits intoOct 4, 2017
Merged
Conversation
seemethere
changed the title
Contributor
Author
|
cc/ @andrewhsu @vieux |
thaJeztah
reviewed
Sep 30, 2017
| @@ -152,7 +152,7 @@ func (s *DockerSuite) TestRmiImageIDForceWithRunningContainersAndMultipleTags(c | |||
|
|
|||
| out, _, err := dockerCmdWithError("rmi", "-f", imgID) | |||
| // rmi -f should not delete image with running containers | |||
Member
There was a problem hiding this comment.
perhaps update the comments as well to match the test; might be really confusing otherwise
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
rmi -f always returns a 0 exit code so these tests needed to be changed accordingly. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com> (cherry picked from commit 5d1587e) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
seemethere
force-pushed
the
fix_tests_for_1710_release
branch
from
e288f40 to
4f818dd
Compare
…haracters of the ID for the stats test substring. Signed-off-by: Corbin <corbin.coleman@docker.com>
thaJeztah
reviewed
Oct 3, 2017
| case outerr := <-ch: | ||
| c.Assert(outerr.err, checker.IsNil, check.Commentf("Error running stats: %v", outerr.err)) | ||
| c.Assert(string(outerr.out), checker.Contains, id) //running container wasn't present in output | ||
| c.Assert(string(outerr.out), checker.Contains, id[:12]) //running container wasn't present in output |
Member
There was a problem hiding this comment.
This one can probably be upstreamed to moby/moby
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
s390x node-1 has kernel 4.6.0, kernel.CompareKernelVersion() returns 0 if the kernels are equal, so include that. Full logic for CompareKernelVersion() is a > b ret 1, a == b ret 0, a < b ret -1 Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com> (cherry picked from commit aa5ea65) Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Contributor
Author
|
Added one last commit from @tophj-ibm that fixes a flaky test on s390x |
docker-jenkins
pushed a commit
that referenced
this pull request
Dec 3, 2018
Merged with https://github.com/seemethere/unir Upstream-commit: 091c4453b8e294b0e10ea9fe24c784c2086719be Component: packaging
docker-jenkins
pushed a commit
that referenced
this pull request
Jun 4, 2019
…d_resolvconf [19.03 backport] build: buildkit now also uses systemd's resolv.conf Upstream-commit: 5fbc0a16e22cf7567cc0c8053ed0f156df018e91 Component: engine
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.
6 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.
Overview
This remedies tests that are known to fail when comparing the
masterversion of both thecliandenginecomponent.Most (if not all) of the test failures are not related to functional code but instead related to test code.
Changes
NotNiltoIsNilforrmi -ftestsDockerTrustSuitetests that are known to fail with recent CLI changes, cc @riyazdfLstatto a regularStat, cc @corbin-coleman