fix: Allow to delete images when names of images are short digest ids…

… of another images Fix cmd/nerdctl/image/image_remove_test.go based on the review. Signed-off-by: Hayato Kiwata <[email protected]>
containerd · Oct 18, 2024 · 384209f · 384209f
1 parent a008261
commit 384209f
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/cmd/nerdctl/image/image_remove_test.go b/cmd/nerdctl/image/image_remove_test.go
@@ -311,9 +311,7 @@ func TestIssue3016(t *testing.T) {
 	testCase := nerdtest.Setup()
 
 	const (
-		alpineImageName  = "alpine"
-		busyboxImageName = "busybox"
-		tagIDKey         = "tagID"
+		tagIDKey = "tagID"
 	)
 
 	testCase.SubTests = []*test.Case{
@@ -323,20 +321,20 @@ func TestIssue3016(t *testing.T) {
 				test.Not(test.Windows),
 			),
 			Setup: func(data test.Data, helpers test.Helpers) {
-				helpers.Ensure("pull", alpineImageName)
-				helpers.Ensure("pull", busyboxImageName)
+				helpers.Ensure("pull", testutil.AlpineImage)
+				helpers.Ensure("pull", testutil.BusyboxImage)
 
-				img := nerdtest.InspectImage(helpers, busyboxImageName)
-				tagID := strings.TrimPrefix(img.RepoDigests[0], "busybox@sha256:")[0:8]
-				assert.Equal(t, len(tagID), 8)
+				img := nerdtest.InspectImage(helpers, testutil.BusyboxImage)
+				repoName, _ := imgutil.ParseRepoTag(testutil.BusyboxImage)
+				tagID := strings.TrimPrefix(img.RepoDigests[0], repoName+"@sha256:")[0:8]
 
-				helpers.Ensure("tag", alpineImageName, tagID)
+				helpers.Ensure("tag", testutil.AlpineImage, tagID)
 
 				data.Set(tagIDKey, tagID)
 			},
 			Cleanup: func(data test.Data, helpers test.Helpers) {
-				helpers.Anyhow("rmi", alpineImageName)
-				helpers.Anyhow("rmi", busyboxImageName)
+				helpers.Anyhow("rmi", "-f", testutil.AlpineImage)
+				helpers.Anyhow("rmi", "-f", testutil.BusyboxImage)
 			},
 			Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
 				return helpers.Command("rmi", data.Get(tagIDKey))