Browse code

fix remaining compile issues

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

Tibor Vass authored on 2019/08/26 23:45:33
Showing 2 changed files
... ...
@@ -24,7 +24,6 @@ import (
24 24
 	"time"
25 25
 
26 26
 	"github.com/docker/docker/client"
27
-	"github.com/docker/docker/integration-cli/checker"
28 27
 	"github.com/docker/docker/integration-cli/cli"
29 28
 	"github.com/docker/docker/integration-cli/cli/build"
30 29
 	"github.com/docker/docker/internal/test/fakecontext"
... ...
@@ -3954,7 +3953,7 @@ func (s *DockerSuite) TestRunAttachFailedNoLeak(c *testing.T) {
3954 3954
 		strings.Contains(string(out), "were not connected because a duplicate name exists") ||
3955 3955
 		strings.Contains(string(out), "The specified port already exists") ||
3956 3956
 		strings.Contains(string(out), "HNS failed with error : Failed to create endpoint") ||
3957
-		strings.Contains(string(out), "HNS failed with error : The object already exists"), checker.Equals, true, fmt.Sprintf("Output: %s", out))
3957
+		strings.Contains(string(out), "HNS failed with error : The object already exists"), fmt.Sprintf("Output: %s", out))
3958 3958
 	dockerCmd(c, "rm", "-f", "test")
3959 3959
 
3960 3960
 	// NGoroutines is not updated right away, so we need to wait before failing
... ...
@@ -430,8 +430,8 @@ func waitAndAssert(t assert.TestingT, timeout time.Duration, f checkF, compariso
430 430
 		default:
431 431
 		}
432 432
 		if shouldAssert {
433
-			if comment != nil {
434
-				args = append(args, comment.CheckCommentString())
433
+			if len(comment) > 0 {
434
+				args = append(args, comment)
435 435
 			}
436 436
 			assert.Assert(t, comparison, args...)
437 437
 			return
... ...
@@ -450,8 +450,8 @@ func reducedCheck(r reducer, funcs ...checkF) checkF {
450 450
 		for _, f := range funcs {
451 451
 			v, comment := f(c)
452 452
 			values = append(values, v)
453
-			if comment != nil {
454
-				comments = append(comments, comment.CheckCommentString())
453
+			if len(comment) > 0 {
454
+				comments = append(comments, comment)
455 455
 			}
456 456
 		}
457 457
 		return r(values...), fmt.Sprintf("%v", strings.Join(comments, ", "))