diff --git a/cmd/nerdctl/image_list_test.go b/cmd/nerdctl/image_list_test.go index 15ea97c82b0..1b07841fcec 100644 --- a/cmd/nerdctl/image_list_test.go +++ b/cmd/nerdctl/image_list_test.go @@ -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) diff --git a/cmd/nerdctl/image_load_linux_test.go b/cmd/nerdctl/image_load_linux_test.go index 613ad17d04f..0f620363a19 100644 --- a/cmd/nerdctl/image_load_linux_test.go +++ b/cmd/nerdctl/image_load_linux_test.go @@ -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) { diff --git a/cmd/nerdctl/image_remove_linux_test.go b/cmd/nerdctl/image_remove_linux_test.go index ecc55b435f9..efb43adb046 100644 --- a/cmd/nerdctl/image_remove_linux_test.go +++ b/cmd/nerdctl/image_remove_linux_test.go @@ -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) { @@ -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)) } diff --git a/cmd/nerdctl/system_prune_linux_test.go b/cmd/nerdctl/system_prune_linux_test.go index da86a11d13a..361698d0954 100644 --- a/cmd/nerdctl/system_prune_linux_test.go +++ b/cmd/nerdctl/system_prune_linux_test.go @@ -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") diff --git a/pkg/testutil/testutil.go b/pkg/testutil/testutil.go index 69c15ad9027..e26b56d0b18 100644 --- a/pkg/testutil/testutil.go +++ b/pkg/testutil/testutil.go @@ -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" @@ -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 +}