fix remaining compile issues

Signed-off-by: Tibor Vass <tibor@docker.com>

integration-cli/docker_cli_run_test.go

@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/docker/docker/client"
-	"github.com/docker/docker/integration-cli/checker"
 	"github.com/docker/docker/integration-cli/cli"
 	"github.com/docker/docker/integration-cli/cli/build"
 	"github.com/docker/docker/internal/test/fakecontext"
@@ -3954,7 +3953,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {
 		strings.Contains(string(out), "were not connected because a duplicate name exists") ||
 		strings.Contains(string(out), "The specified port already exists") ||
 		strings.Contains(string(out), "HNS failed with error : Failed to create endpoint") ||
-		strings.Contains(string(out), "HNS failed with error : The object already exists"), checker.Equals, true, fmt.Sprintf("Output: %s", out))
+		strings.Contains(string(out), "HNS failed with error : The object already exists"), fmt.Sprintf("Output: %s", out))
 	dockerCmd(c, "rm", "-f", "test")
 
 	// NGoroutines is not updated right away, so we need to wait before failing

integration-cli/docker_utils_test.go

@@ -430,8 +430,8 @@ func waitAndAssert(t assert.TestingT, timeout time.Duration, f checkF, compariso
 		default:
 		}
 		if shouldAssert {
-			if comment != nil {
-				args = append(args, comment.CheckCommentString())
+			if len(comment) > 0 {
+				args = append(args, comment)
 			}
 			assert.Assert(t, comparison, args...)
 			return
@@ -450,8 +450,8 @@ func reducedCheck(r reducer, funcs ...checkF) checkF {
 		for _, f := range funcs {
 			v, comment := f(c)
 			values = append(values, v)
-			if comment != nil {
-				comments = append(comments, comment.CheckCommentString())
+			if len(comment) > 0 {
+				comments = append(comments, comment)
 			}
 		}
 		return r(values...), fmt.Sprintf("%v", strings.Join(comments, ", "))