@@ -6,6 +6,7 @@ import (

 	"strings"

 	"testing"

+	"github.com/docker/docker/integration-cli/cli"

 	"gotest.tools/v3/assert"

 )

@@ -23,7 +24,7 @@ func (s *DockerCLISearchSuite) OnTimeout(c *testing.T) {

 // search for repos named  "registry" on the central registry

 func (s *DockerCLISearchSuite) TestSearchOnCentralRegistry(c *testing.T) {

-	out, _ := dockerCmd(c, "search", "busybox")

+	out := cli.DockerCmd(c, "search", "busybox").Stdout()

 	assert.Assert(c, strings.Contains(out, "Busybox base image."), "couldn't find any repository named (or containing) 'Busybox base image.'")

 }

@@ -46,35 +47,35 @@ func (s *DockerCLISearchSuite) TestSearchStarsOptionWithWrongParameter(c *testin

 }

 func (s *DockerCLISearchSuite) TestSearchCmdOptions(c *testing.T) {

-	outSearchCmd, _ := dockerCmd(c, "search", "busybox")

+	outSearchCmd := cli.DockerCmd(c, "search", "busybox").Combined()

 	assert.Assert(c, strings.Count(outSearchCmd, "\n") > 3, outSearchCmd)

-	outSearchCmdautomated, _ := dockerCmd(c, "search", "--filter", "is-automated=true", "busybox") // The busybox is a busybox base image, not an AUTOMATED image.

+	outSearchCmdautomated := cli.DockerCmd(c, "search", "--filter", "is-automated=true", "busybox").Combined() // The busybox is a busybox base image, not an AUTOMATED image.

 	outSearchCmdautomatedSlice := strings.Split(outSearchCmdautomated, "\n")

 	for i := range outSearchCmdautomatedSlice {

 		assert.Assert(c, !strings.HasPrefix(outSearchCmdautomatedSlice[i], "busybox "), "The busybox is not an AUTOMATED image: %s", outSearchCmdautomated)

 	}

-	outSearchCmdNotOfficial, _ := dockerCmd(c, "search", "--filter", "is-official=false", "busybox") // The busybox is a busybox base image, official image.

+	outSearchCmdNotOfficial := cli.DockerCmd(c, "search", "--filter", "is-official=false", "busybox").Combined() // The busybox is a busybox base image, official image.

 	outSearchCmdNotOfficialSlice := strings.Split(outSearchCmdNotOfficial, "\n")

 	for i := range outSearchCmdNotOfficialSlice {

 		assert.Assert(c, !strings.HasPrefix(outSearchCmdNotOfficialSlice[i], "busybox "), "The busybox is not an OFFICIAL image: %s", outSearchCmdNotOfficial)

 	}

-	outSearchCmdOfficial, _ := dockerCmd(c, "search", "--filter", "is-official=true", "busybox") // The busybox is a busybox base image, official image.

+	outSearchCmdOfficial := cli.DockerCmd(c, "search", "--filter", "is-official=true", "busybox").Combined() // The busybox is a busybox base image, official image.

 	outSearchCmdOfficialSlice := strings.Split(outSearchCmdOfficial, "\n")

 	assert.Equal(c, len(outSearchCmdOfficialSlice), 3) // 1 header, 1 line, 1 carriage return

 	assert.Assert(c, strings.HasPrefix(outSearchCmdOfficialSlice[1], "busybox "), "The busybox is an OFFICIAL image: %s", outSearchCmdOfficial)

-	outSearchCmdStars, _ := dockerCmd(c, "search", "--filter", "stars=10", "busybox")

+	outSearchCmdStars := cli.DockerCmd(c, "search", "--filter", "stars=10", "busybox").Combined()

 	assert.Assert(c, strings.Count(outSearchCmdStars, "\n") <= strings.Count(outSearchCmd, "\n"), "Number of images with 10+ stars should be less than that of all images:\noutSearchCmdStars: %s\noutSearch: %s\n", outSearchCmdStars, outSearchCmd)

-	dockerCmd(c, "search", "--filter", "is-automated=true", "--filter", "stars=2", "--no-trunc=true", "busybox")

+	cli.DockerCmd(c, "search", "--filter", "is-automated=true", "--filter", "stars=2", "--no-trunc=true", "busybox")

 }

 // search for repos which start with "ubuntu-" on the central registry

 func (s *DockerCLISearchSuite) TestSearchOnCentralRegistryWithDash(c *testing.T) {

-	dockerCmd(c, "search", "ubuntu-")

+	cli.DockerCmd(c, "search", "ubuntu-")

 }

 // test case for #23055