@@ -14,8 +14,8 @@ import (

 	"github.com/docker/docker/api/types/strslice"

 	"github.com/docker/docker/builder"

 	"github.com/docker/docker/builder/dockerfile/parser"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/docker/docker/pkg/system"

-	"github.com/docker/docker/pkg/testutil"

 	"github.com/docker/go-connections/nat"

 	"github.com/stretchr/testify/assert"

 	"github.com/stretchr/testify/require"

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

 	"fmt"

 	"testing"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/stretchr/testify/assert"

 )

@@ -10,8 +10,8 @@ import (

 	"testing"

 	"github.com/docker/docker/builder"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/docker/docker/pkg/archive"

-	"github.com/docker/docker/pkg/testutil"

 	"github.com/stretchr/testify/assert"

 	"github.com/stretchr/testify/require"

 )

@@ -10,7 +10,7 @@ import (

 	"testing"

 	"github.com/docker/docker/api/types"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/stretchr/testify/assert"

 	"github.com/stretchr/testify/require"

 	"golang.org/x/net/context"

@@ -4,7 +4,7 @@ import (

 	"testing"

 	"github.com/docker/docker/daemon/config"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/gotestyourself/gotestyourself/fs"

 	"github.com/sirupsen/logrus"

 	"github.com/spf13/pflag"

@@ -8,8 +8,8 @@ import (

 	"testing"

 	"github.com/docker/docker/daemon/discovery"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/docker/docker/opts"

-	"github.com/docker/docker/pkg/testutil"

 	"github.com/spf13/pflag"

 	"github.com/stretchr/testify/assert"

 )

@@ -9,7 +9,7 @@ import (

 	"github.com/docker/docker/api/types"

 	containertypes "github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/container"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/stretchr/testify/require"

 )

@@ -10,7 +10,7 @@ import (

 	"github.com/docker/distribution/manifest/schema1"

 	"github.com/docker/distribution/reference"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/opencontainers/go-digest"

 )

@@ -11,7 +11,7 @@ import (

 	"path/filepath"

 	"testing"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/opencontainers/go-digest"

 	"github.com/stretchr/testify/assert"

 )

@@ -4,8 +4,8 @@ import (

 	"runtime"

 	"testing"

+	"github.com/docker/docker/internal/testutil"

 	"github.com/docker/docker/layer"

-	"github.com/docker/docker/pkg/testutil"

 	"github.com/opencontainers/go-digest"

 	"github.com/stretchr/testify/assert"

 )

@@ -8,7 +8,7 @@ import (

 	"github.com/docker/docker/api/types/container"

 	"github.com/docker/docker/api/types/network"

 	"github.com/docker/docker/integration/util/request"

-	"github.com/docker/docker/pkg/testutil"

+	"github.com/docker/docker/internal/testutil"

 )

 func TestCreateFailsWhenIdentifierDoesNotExist(t *testing.T) {

new file mode 100644

@@ -0,0 +1,13 @@

+package testutil

+

+import (

+	"github.com/stretchr/testify/assert"

+	"github.com/stretchr/testify/require"

+)

+

+// ErrorContains checks that the error is not nil, and contains the expected

+// substring.

+func ErrorContains(t require.TestingT, err error, expectedError string) {

+	require.Error(t, err)

+	assert.Contains(t, err.Error(), expectedError)

+}

deleted file mode 100644

@@ -1,13 +0,0 @@

-package testutil

-

-import (

-	"github.com/stretchr/testify/assert"

-	"github.com/stretchr/testify/require"

-)

-

-// ErrorContains checks that the error is not nil, and contains the expected

-// substring.

-func ErrorContains(t require.TestingT, err error, expectedError string) {

-	require.Error(t, err)

-	assert.Contains(t, err.Error(), expectedError)

-}