Skip to content

Fix images output check bug #1999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2023
Merged

Fix images output check bug #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cmd/nerdctl/image_list_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ LABEL version=0.1`, testutil.CommonImage)
base.Cmd("pull", busyboxUclibc).AssertOK()
defer base.Cmd("rmi", busyboxUclibc).AssertOK()

base.Cmd("images", "--filter", fmt.Sprintf("before=%s:%s", tempName, "latest")).AssertOutContains(strings.Split(testutil.CommonImage, ":")[0])
base.Cmd("images", "--filter", fmt.Sprintf("before=%s:%s", tempName, "latest")).AssertOutContains(testutil.ImageRepo(testutil.CommonImage))
base.Cmd("images", "--filter", fmt.Sprintf("before=%s:%s", tempName, "latest")).AssertOutNotContains(tempName)
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage)).AssertOutContains(tempName)
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage)).AssertOutNotContains(strings.Split(testutil.CommonImage, ":")[0])
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage), testutil.CommonImage).AssertOutNotContains(strings.Split(testutil.CommonImage, ":")[0])
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage)).AssertOutNotContains(testutil.ImageRepo(testutil.CommonImage))
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage), testutil.CommonImage).AssertOutNotContains(testutil.ImageRepo(testutil.CommonImage))
base.Cmd("images", "--filter", fmt.Sprintf("since=%s", testutil.CommonImage), testutil.CommonImage).AssertOutNotContains(tempName)
base.Cmd("images", "--filter", "label=foo=bar").AssertOutContains(tempName)
base.Cmd("images", "--filter", "label=foo=bar1").AssertOutNotContains(tempName)
Expand Down
2 changes: 1 addition & 1 deletion cmd/nerdctl/image_load_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestLoadStdinFromPipe(t *testing.T) {
assert.NilError(t, err)

assert.Assert(t, strings.Contains(string(fb), fmt.Sprintf("Loaded image: %s:latest", img)))
base.Cmd("images").AssertOutContains(strings.Split(img, ":")[0])
base.Cmd("images").AssertOutContains(testutil.ImageRepo(testutil.CommonImage))
}

func TestLoadStdinEmpty(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/nerdctl/image_remove_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestRemoveImage(t *testing.T) {
defer base.Cmd("rmi", "-f", testutil.CommonImage).Run()
base.Cmd("rmi", "-f", testutil.CommonImage).AssertOK()

base.Cmd("images").AssertNoOut(testutil.CommonImage)
base.Cmd("images").AssertNoOut(testutil.ImageRepo(testutil.CommonImage))
}

func TestRemoveRunningImage(t *testing.T) {
Expand All @@ -49,5 +49,5 @@ func TestRemoveRunningImage(t *testing.T) {
base.Cmd("kill", tID).AssertOK()
base.Cmd("rmi", testutil.CommonImage).AssertFail()
base.Cmd("rmi", "-f", testutil.CommonImage).AssertOK()
base.Cmd("images").AssertNoOut(testutil.CommonImage)
base.Cmd("images").AssertNoOut(testutil.ImageRepo(testutil.CommonImage))
}
4 changes: 2 additions & 2 deletions cmd/nerdctl/system_prune_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ func TestSystemPrune(t *testing.T) {
defer base.Cmd("rm", "-f", tID).Run()

base.Cmd("ps", "-a").AssertOutContains(tID)
base.Cmd("images").AssertOutContains("alpine")
base.Cmd("images").AssertOutContains(testutil.ImageRepo(testutil.CommonImage))

base.Cmd("system", "prune", "-f", "--volumes", "--all").AssertOK()
base.Cmd("volume", "ls").AssertNoOut(vID)
base.Cmd("ps", "-a").AssertNoOut(tID)
base.Cmd("network", "ls").AssertNoOut(nID)
base.Cmd("images").AssertNoOut("alpine")
base.Cmd("images").AssertNoOut(testutil.ImageRepo(testutil.CommonImage))

if testutil.GetTarget() != testutil.Nerdctl {
t.Skip("test skipped for buildkitd is not available with docker-compatible tests")
Expand Down
8 changes: 8 additions & 0 deletions pkg/testutil/testutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/Masterminds/semver/v3"
"github.com/containerd/containerd/defaults"
"github.com/containerd/nerdctl/pkg/buildkitutil"
"github.com/containerd/nerdctl/pkg/imgutil"
"github.com/containerd/nerdctl/pkg/infoutil"
"github.com/containerd/nerdctl/pkg/inspecttypes/dockercompat"
"github.com/containerd/nerdctl/pkg/inspecttypes/native"
Expand Down Expand Up @@ -684,3 +685,10 @@ func Identifier(t testing.TB) string {
}
return s
}

// ImageRepo returns the image repo that can be used to, e.g, validate output
// from `nerdctl images`.
func ImageRepo(s string) string {
repo, _ := imgutil.ParseRepoTag(s)
return repo
}