From 8f1134b46deb3cedf48d32111fa4c5d33caad611 Mon Sep 17 00:00:00 2001
From: Aditya Mishra <mishraaditya675@gmail.com>
Date: Wed, 12 Nov 2025 21:09:41 +0530
Subject: [PATCH] integration/image: migrate TestAPIImagesDelete to the new
 integration test framework

Migrated TestAPIImagesDelete from the legacy integration-cli suite
(docker_api_images_test.go) to the new integration test framework under
integration/image/remove_test.go.

This update:
- Fixes ENV instruction syntax to use "ENV FOO=bar"
- Adds error type check using errdefs.IsNotFound for cleaner assertions
- Ensures consistent cleanup handling

Signed-off-by: Aditya Mishra <mishraaditya675@gmail.com>
---
 integration-cli/docker_api_images_test.go | 24 --------------
 integration/image/remove_test.go          | 39 +++++++++++++++++++++++
 2 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/integration-cli/docker_api_images_test.go b/integration-cli/docker_api_images_test.go
index 0a1a9af601..a0d7394f1e 100644
--- a/integration-cli/docker_api_images_test.go
+++ b/integration-cli/docker_api_images_test.go
@@ -36,30 +36,6 @@ func (s *DockerAPISuite) TestAPIImagesSaveAndLoad(c *testing.T) {
 	assert.Equal(c, strings.TrimSpace(inspectOut), id, "load did not work properly")
 }
 
-func (s *DockerAPISuite) TestAPIImagesDelete(c *testing.T) {
-	apiClient, err := client.New(client.FromEnv)
-	assert.NilError(c, err)
-	defer apiClient.Close()
-
-	if testEnv.DaemonInfo.OSType != "windows" {
-		testRequires(c, Network)
-	}
-	name := "test-api-images-delete"
-	cli.BuildCmd(c, name, build.WithDockerfile("FROM busybox\nENV FOO bar"))
-	id := getIDByName(c, name)
-
-	cli.DockerCmd(c, "tag", name, "test:tag1")
-
-	_, err = apiClient.ImageRemove(testutil.GetContext(c), id, client.ImageRemoveOptions{})
-	assert.ErrorContains(c, err, "unable to delete")
-
-	_, err = apiClient.ImageRemove(testutil.GetContext(c), "test:noexist", client.ImageRemoveOptions{})
-	assert.ErrorContains(c, err, "No such image")
-
-	_, err = apiClient.ImageRemove(testutil.GetContext(c), "test:tag1", client.ImageRemoveOptions{})
-	assert.NilError(c, err)
-}
-
 func (s *DockerAPISuite) TestAPIImagesImportBadSrc(c *testing.T) {
 	testRequires(c, Network, testEnv.IsLocalDaemon)
 
diff --git a/integration/image/remove_test.go b/integration/image/remove_test.go
index 78c436025c..6b3fc64c8d 100644
--- a/integration/image/remove_test.go
+++ b/integration/image/remove_test.go
@@ -9,8 +9,11 @@ import (
 
 	"github.com/moby/moby/api/types/image"
 	"github.com/moby/moby/client"
+	"github.com/moby/moby/client/pkg/stringid"
+	build "github.com/moby/moby/v2/integration/internal/build"
 	"github.com/moby/moby/v2/integration/internal/container"
 	iimage "github.com/moby/moby/v2/integration/internal/image"
+	"github.com/moby/moby/v2/internal/testutil/fakecontext"
 	"github.com/moby/moby/v2/internal/testutil/specialimage"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"gotest.tools/v3/assert"
@@ -176,3 +179,39 @@ func checkPlatformDeleted(t *testing.T, imageIdx *ocispec.Index, resp []image.De
 		}
 	}
 }
+
+func TestAPIImagesDelete(t *testing.T) {
+	ctx := setupTest(t)
+	apiClient := testEnv.APIClient()
+
+	const name = "test-api-images-delete"
+
+	buildCtx := fakecontext.New(t, t.TempDir(),
+		fakecontext.WithDockerfile(`FROM busybox
+ENV FOO=bar`))
+	defer buildCtx.Close()
+
+	imgID := build.Do(ctx, t, apiClient, buildCtx)
+
+	// Cleanup always runs
+	defer func() {
+		_, _ = apiClient.ImageRemove(ctx, imgID, client.ImageRemoveOptions{Force: true})
+	}()
+
+	_, err := apiClient.ImageTag(ctx, client.ImageTagOptions{Source: imgID, Target: name})
+	assert.NilError(t, err)
+
+	_, err = apiClient.ImageTag(ctx, client.ImageTagOptions{Source: imgID, Target: "test:tag1"})
+	assert.NilError(t, err)
+
+	_, err = apiClient.ImageRemove(ctx, imgID, client.ImageRemoveOptions{})
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsConflict))
+	assert.Check(t, is.ErrorContains(err, "unable to delete "+stringid.TruncateID(imgID)))
+
+	_, err = apiClient.ImageRemove(ctx, "test:noexist", client.ImageRemoveOptions{})
+	assert.Check(t, is.ErrorType(err, cerrdefs.IsNotFound))
+	assert.Check(t, is.ErrorContains(err, "No such image: test:noexist"))
+
+	_, err = apiClient.ImageRemove(ctx, "test:tag1", client.ImageRemoveOptions{})
+	assert.NilError(t, err)
+}