client test: Fix check for whether sandbox has containerd#1538
Merged
tonistiigi merged 2 commits intomoby:masterfrom Jun 23, 2020
Merged
client test: Fix check for whether sandbox has containerd#1538tonistiigi merged 2 commits intomoby:masterfrom
tonistiigi merged 2 commits intomoby:masterfrom
Conversation
tonistiigi
reviewed
Jun 21, 2020
| }); !ok { | ||
| cdAddress := sb.ContainerdAddress() | ||
| if cdAddress == "" { | ||
| return |
Member
There was a problem hiding this comment.
Should return skip here so we would notice when something like this happens. Or if a test has meaningful parts before the return maybe log out that "containerd specific parts were skipped".
Collaborator
Author
There was a problem hiding this comment.
Updated to have them call t.Skip(). For the tests w/ meaningful parts before, they will still be marked as Failed if any of their require assertions fail before the skip call.
2f57fd2 to
7c4e34e
Compare
Before this, the check was always returning that containerd wasn't running and thus skipping the rest of several test cases. Signed-off-by: Erik Sipsma <erik@sipsma.dev>
This test had previously been accidentally not executing past the check for whether containerd was running. A previous commit fixes that check, this commit fixes a few bugs that had been going unnoticed in the containerd-specific part of the test's code. Signed-off-by: Erik Sipsma <erik@sipsma.dev>
Collaborator
Author
|
Updated w/ a separate commit that fixes the pre-existing test failures in |
This was referenced Jun 23, 2020
tonistiigi
approved these changes
Jun 23, 2020
Member
|
Thanks! |
fuweid
reviewed
Jun 24, 2020
| targetImg := llb.Image(target) | ||
| cmd = `sh -e -c "echo gzip > data"` | ||
| st = targetImg.Run(llb.Shlex(cmd), llb.Dir("/wd")).GetMount("/wd") | ||
| cmd = `sh -e -c "echo -n gzip > data"` |
Contributor
There was a problem hiding this comment.
just curiosity, why add -n here?
Contributor
There was a problem hiding this comment.
never mind, the newline appened. Thanks!
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before this, the check was always returning that containerd wasn't running and
thus skipping the rest of several test cases.
Signed-off-by: Erik Sipsma erik@sipsma.dev
Here's a go playground w/ a stripped down example that I believe shows the
interface{}check wasn't working as expected.