From 5da85219fa13a7b64d88a590d8af539855d4dba7 Mon Sep 17 00:00:00 2001 From: Hayato Kiwata Date: Sat, 19 Oct 2024 16:00:53 +0900 Subject: [PATCH] fix: Allow to delete images when names of images are short digest ids of another images Fix cmd/nerdctl/image/image_remove_test.go to run on the Windows environment based on the review. Signed-off-by: Hayato Kiwata --- cmd/nerdctl/image/image_remove_test.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/cmd/nerdctl/image/image_remove_test.go b/cmd/nerdctl/image/image_remove_test.go index 48a45f27515..eb064caade7 100644 --- a/cmd/nerdctl/image/image_remove_test.go +++ b/cmd/nerdctl/image/image_remove_test.go @@ -317,24 +317,21 @@ func TestIssue3016(t *testing.T) { testCase.SubTests = []*test.Case{ { Description: "Issue #3016 - Tags created using the short digest ids of container images cannot be deleted using the nerdctl rmi command.", - Require: test.Require( - test.Not(test.Windows), - ), Setup: func(data test.Data, helpers test.Helpers) { - helpers.Ensure("pull", testutil.AlpineImage) - helpers.Ensure("pull", testutil.BusyboxImage) + helpers.Ensure("pull", testutil.CommonImage) + helpers.Ensure("pull", testutil.NginxAlpineImage) - img := nerdtest.InspectImage(helpers, testutil.BusyboxImage) - repoName, _ := imgutil.ParseRepoTag(testutil.BusyboxImage) + img := nerdtest.InspectImage(helpers, testutil.NginxAlpineImage) + repoName, _ := imgutil.ParseRepoTag(testutil.NginxAlpineImage) tagID := strings.TrimPrefix(img.RepoDigests[0], repoName+"@sha256:")[0:8] - helpers.Ensure("tag", testutil.AlpineImage, tagID) + helpers.Ensure("tag", testutil.CommonImage, tagID) data.Set(tagIDKey, tagID) }, Cleanup: func(data test.Data, helpers test.Helpers) { - helpers.Anyhow("rmi", "-f", testutil.AlpineImage) - helpers.Anyhow("rmi", "-f", testutil.BusyboxImage) + helpers.Anyhow("rmi", "-f", testutil.CommonImage) + helpers.Anyhow("rmi", "-f", testutil.NginxAlpineImage) }, Command: func(data test.Data, helpers test.Helpers) test.TestableCommand { return helpers.Command("rmi", data.Get(tagIDKey))