This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[WIP][19.03 backport] Testing and Jenkinsfile changes [step 3]#384
Closed
thaJeztah wants to merge 9 commits into
Closed
[WIP][19.03 backport] Testing and Jenkinsfile changes [step 3]#384thaJeztah wants to merge 9 commits into
thaJeztah wants to merge 9 commits into
Conversation
thaJeztah
force-pushed
the
19.03_backport_test_fixes_3
branch
6 times, most recently
from
9acc8c9 to
daf2624
Compare
tianon
approved these changes
Nov 26, 2019
tianon
left a comment
tianon
left a comment
There was a problem hiding this comment.
Changes all appear minor and/or reasonable, LGTM 👍
4 tasks
Refactored exiting logic on way that layers are first marked to be under removal so if actual removal fails they can be found from disk and cleaned up. Full garbage collector will be implemented as part of containerd migration. Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com> (cherry picked from commit 213681b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1. Reduce complexity due to nested if blocks by using early return/continue 2. Improve logging Changes suggested as a part of code review comments in 39748 Signed-off-by: Vikram bir Singh <vikrambir.singh@docker.com> (cherry picked from commit ebf12db) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (cherry picked from commit d6cbeee) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com> (cherry picked from commit 8660330) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
While working on other tests I noticed that environment.Execution cannot be used for anything but the pre-configured daemon, however this can come in handy for being able share daemons across multiple tests that currently spin up a new daemon. The execution env also seems to be misused in some of these cases. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit 1381956) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This was done with something along the lines of:
```
mv internal/test testutil
pushd testutil/; grep -IRl "package test" | xargs -I '{}' sed -i -e 's|package test|package testutil|g' {}; popd
mv internal/testutil/*.go testutil/ && rm -rf internal/
grep -IRl "github.com\/docker\/docker\/internal\/test" | xargs -I '{}' sed -i -e 's|github.com/docker/docker/internal/test|github.com/docker/docker/test|g' {}
goimports .
```
I also modified the basic plugin path in testutil/fixtures/plugin.
Signed-off-by: Sam Whited <sam@samwhited.com>
(cherry picked from commit b37c214)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sam Whited <sam@samwhited.com> (cherry picked from commit 41adef2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Fix TODO: move into startMetricsServer() Fix errors.Wrap return nil when passed err is nil Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com> Signed-off-by: HuanHuan Ye <logindaveye@gmail.com> (cherry picked from commit 88c554f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Found these by doing a `grep -R 'using the force'` on a full test run. There's still a few more which are running against the main test daemon, so it is difficult to find which test they belong to. Signed-off-by: Brian Goff <cpuguy83@gmail.com> (cherry picked from commit fcd65eb) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
19.03_backport_test_fixes_3
branch
from
daf2624 to
5f3677a
Compare
Member
Author
|
moved to moby#40413 |
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.
8 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.
based on top of
#383#268 - first four commits are from that PRFromClientto test env execution moby/moby#39602 AddFromClientto test env executionconflicts are described below;