Merge pull request #37110 from thaJeztah/remove-testutil-errorcontains

Replace deprecated testutil.ErrorContains()
Upstream-commit: 9bd5d9912f0cb4fe22b994ac1e7e10038e3be65a
Component: engine

components/engine/daemon/config/config_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/docker/docker/daemon/discovery"
-	"github.com/docker/docker/internal/testutil"
 	"github.com/docker/docker/opts"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
@@ -62,10 +61,7 @@ func TestFindConfigurationConflicts(t *testing.T) {
 
 	flags.String("authorization-plugins", "", "")
 	assert.Check(t, flags.Set("authorization-plugins", "asdf"))
-
-	testutil.ErrorContains(t,
-		findConfigurationConflicts(config, flags),
-		"authorization-plugins: (from flag: asdf, from file: foobar)")
+	assert.Check(t, is.ErrorContains(findConfigurationConflicts(config, flags), "authorization-plugins: (from flag: asdf, from file: foobar)"))
 }
 
 func TestFindConfigurationConflictsWithNamedOptions(t *testing.T) {
@@ -76,8 +72,7 @@ func TestFindConfigurationConflictsWithNamedOptions(t *testing.T) {
 	flags.VarP(opts.NewNamedListOptsRef("hosts", &hosts, opts.ValidateHost), "host", "H", "Daemon socket(s) to connect to")
 	assert.Check(t, flags.Set("host", "tcp://127.0.0.1:4444"))
 	assert.Check(t, flags.Set("host", "unix:///var/run/docker.sock"))
-
-	testutil.ErrorContains(t, findConfigurationConflicts(config, flags), "hosts")
+	assert.Check(t, is.ErrorContains(findConfigurationConflicts(config, flags), "hosts"))
 }
 
 func TestDaemonConfigurationMergeConflicts(t *testing.T) {
@@ -460,8 +455,7 @@ func TestReloadSetConfigFileNotExist(t *testing.T) {
 	flags.Set("config-file", configFile)
 
 	err := Reload(configFile, flags, func(c *Config) {})
-	assert.Check(t, is.ErrorContains(err, ""))
-	testutil.ErrorContains(t, err, "unable to configure the Docker daemon with file")
+	assert.Check(t, is.ErrorContains(err, "unable to configure the Docker daemon with file"))
 }
 
 // TestReloadDefaultConfigNotExist tests that if the default configuration file
@@ -494,8 +488,7 @@ func TestReloadBadDefaultConfig(t *testing.T) {
 	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
 	flags.String("config-file", configFile, "")
 	err = Reload(configFile, flags, func(c *Config) {})
-	assert.Check(t, is.ErrorContains(err, ""))
-	testutil.ErrorContains(t, err, "unable to configure the Docker daemon with file")
+	assert.Check(t, is.ErrorContains(err, "unable to configure the Docker daemon with file"))
 }
 
 func TestReloadWithConflictingLabels(t *testing.T) {
@@ -508,7 +501,7 @@ func TestReloadWithConflictingLabels(t *testing.T) {
 	flags.String("config-file", configFile, "")
 	flags.StringSlice("labels", lbls, "")
 	err := Reload(configFile, flags, func(c *Config) {})
-	testutil.ErrorContains(t, err, "conflict labels for foo=baz and foo=bar")
+	assert.Check(t, is.ErrorContains(err, "conflict labels for foo=baz and foo=bar"))
 }
 
 func TestReloadWithDuplicateLabels(t *testing.T) {

components/engine/daemon/delete_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/docker/docker/api/types"
 	containertypes "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/container"
-	"github.com/docker/docker/internal/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
+	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 )
 
 func newDaemonWithTmpRoot(t *testing.T) (*Daemon, func()) {
@@ -30,7 +30,6 @@ func newContainerWithState(state *container.State) *container.Container {
 		State:  state,
 		Config: &containertypes.Config{},
 	}
-
 }
 
 // TestContainerDelete tests that a useful error message and instructions is
@@ -74,8 +73,8 @@ func TestContainerDelete(t *testing.T) {
 		d.containers.Add(c.ID, c)
 
 		err := d.ContainerRm(c.ID, &types.ContainerRmConfig{ForceRemove: false})
-		testutil.ErrorContains(t, err, te.errMsg)
-		testutil.ErrorContains(t, err, te.fixMsg)
+		assert.Check(t, is.ErrorContains(err, te.errMsg))
+		assert.Check(t, is.ErrorContains(err, te.fixMsg))
 	}
 }
 
@@ -92,5 +91,5 @@ func TestContainerDoubleDelete(t *testing.T) {
 	// Try to remove the container when its state is removalInProgress.
 	// It should return an error indicating it is under removal progress.
 	err := d.ContainerRm(c.ID, &types.ContainerRmConfig{ForceRemove: true})
-	testutil.ErrorContains(t, err, fmt.Sprintf("removal of container %s is already in progress", c.ID))
+	assert.Check(t, is.ErrorContains(err, fmt.Sprintf("removal of container %s is already in progress", c.ID)))
 }

components/engine/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go

@@ -4,7 +4,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/internal/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 )
@@ -12,11 +11,11 @@ import (
 func TestFastTimeMarshalJSONWithInvalidYear(t *testing.T) {
 	aTime := time.Date(-1, 1, 1, 0, 0, 0, 0, time.Local)
 	_, err := fastTimeMarshalJSON(aTime)
-	testutil.ErrorContains(t, err, "year outside of range")
+	assert.Check(t, is.ErrorContains(err, "year outside of range"))
 
 	anotherTime := time.Date(10000, 1, 1, 0, 0, 0, 0, time.Local)
 	_, err = fastTimeMarshalJSON(anotherTime)
-	testutil.ErrorContains(t, err, "year outside of range")
+	assert.Check(t, is.ErrorContains(err, "year outside of range"))
 }
 
 func TestFastTimeMarshalJSON(t *testing.T) {

components/engine/daemon/trustkey_test.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/docker/docker/internal/testutil"
 	"github.com/gotestyourself/gotestyourself/assert"
 	is "github.com/gotestyourself/gotestyourself/assert/cmp"
 	"github.com/gotestyourself/gotestyourself/fs"
@@ -22,7 +21,7 @@ func TestLoadOrCreateTrustKeyInvalidKeyFile(t *testing.T) {
 	assert.NilError(t, err)
 
 	_, err = loadOrCreateTrustKey(tmpKeyFile.Name())
-	testutil.ErrorContains(t, err, "Error loading key file")
+	assert.Check(t, is.ErrorContains(err, "Error loading key file"))
 }
 
 func TestLoadOrCreateTrustKeyCreateKeyWhenFileDoesNotExist(t *testing.T) {