Post migration fixes

Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>

cli/command/formatter/checkpoint_test.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/docker/docker/api/types"
 	"github.com/gotestyourself/gotestyourself/assert"
-	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 )
 
 func TestCheckpointContextFormatWrite(t *testing.T) {
@@ -47,10 +46,7 @@ checkpoint-3:
 		out := bytes.NewBufferString("")
 		testcase.context.Output = out
 		err := CheckpointWrite(testcase.context, checkpoints)
-		if err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
-		} else {
-			assert.Check(t, is.Equal(out.String(), testcase.expected))
-		}
+		assert.NilError(t, err)
+		assert.Equal(t, out.String(), testcase.expected)
 	}
 }

cli/command/formatter/config_test.go

@@ -56,7 +56,7 @@ id_rsa
 		out := bytes.NewBufferString("")
 		testcase.context.Output = out
 		if err := ConfigWrite(testcase.context, configs); err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
+			assert.ErrorContains(t, err, testcase.expected)
 		} else {
 			assert.Check(t, is.Equal(out.String(), testcase.expected))
 		}

cli/command/formatter/search_test.go

@@ -155,7 +155,7 @@ result2 5
 		testcase.context.Output = out
 		err := SearchWrite(testcase.context, results, false, 0)
 		if err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
+			assert.Check(t, is.ErrorContains(err, testcase.expected))
 		} else {
 			assert.Check(t, is.Equal(out.String(), testcase.expected))
 		}
@@ -192,7 +192,7 @@ result2
 		testcase.context.Output = out
 		err := SearchWrite(testcase.context, results, true, 0)
 		if err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
+			assert.Check(t, is.ErrorContains(err, testcase.expected))
 		} else {
 			assert.Check(t, is.Equal(out.String(), testcase.expected))
 		}
@@ -227,7 +227,7 @@ result1
 		testcase.context.Output = out
 		err := SearchWrite(testcase.context, results, false, 6)
 		if err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
+			assert.Check(t, is.ErrorContains(err, testcase.expected))
 		} else {
 			assert.Check(t, is.Equal(out.String(), testcase.expected))
 		}

cli/command/formatter/stack_test.go

@@ -57,7 +57,7 @@ bar
 		testcase.context.Output = out
 		err := StackWrite(testcase.context, stacks)
 		if err != nil {
-			assert.Check(t, is.ErrorContains(err, ""), testcase.expected)
+			assert.Check(t, is.ErrorContains(err, testcase.expected))
 		} else {
 			assert.Check(t, is.Equal(out.String(), testcase.expected))
 		}