@@ -118,21 +118,6 @@ func (d *Daemon) WaitRun(contID string) error {

 	return WaitInspectWithArgs(d.dockerBinary, contID, "{{.State.Running}}", "true", 10*time.Second, args...)

 }

-// CmdRetryOutOfSequence tries the specified command against the current daemon for 10 times

-func (d *Daemon) CmdRetryOutOfSequence(args ...string) (string, error) {

-	for i := 0; ; i++ {

-		out, err := d.Cmd(args...)

-		if err != nil {

-			if strings.Contains(out, "update out of sequence") {

-				if i < 10 {

-					continue

-				}

-			}

-		}

-		return out, err

-	}

-}

-

 // WaitInspectWithArgs waits for the specified expression to be equals to the specified expected string in the given time.

 // Deprecated: use cli.WaitCmd instead

 func WaitInspectWithArgs(dockerBinary, name, expr, expected string, timeout time.Duration, arg ...string) error {

@@ -15,7 +15,7 @@ import (

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/go-check/check"

 	"golang.org/x/net/websocket"

@@ -13,10 +13,10 @@ import (

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

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/internal/test/fakecontext"

 	"github.com/docker/docker/internal/test/fakegit"

 	"github.com/docker/docker/internal/test/fakestorage"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

@@ -24,7 +24,7 @@ import (

 	"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/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/ioutils"

 	"github.com/docker/docker/pkg/mount"

 	"github.com/docker/docker/pkg/stringid"

@@ -1254,13 +1254,13 @@ func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {

 		"OpenStdin": true,

 	}

-	resp, _, err := request.Post("/containers/create", request.JSONBody(config), func(req *http.Request) error {

+	resp, _, err := request.Post("/containers/create", request.JSONBody(config), request.With(func(req *http.Request) error {

 		// This is a cheat to make the http request do chunked encoding

 		// Otherwise (just setting the Content-Encoding to chunked) net/http will overwrite

 		// https://golang.org/src/pkg/net/http/request.go?s=11980:12172

 		req.ContentLength = -1

 		return nil

-	})

+	}))

 	c.Assert(err, checker.IsNil, check.Commentf("error creating container with chunked encoding"))

 	defer resp.Body.Close()

 	c.Assert(resp.StatusCode, checker.Equals, http.StatusCreated)

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

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

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

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

 	"sync"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

@@ -15,7 +15,7 @@ import (

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 )

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

 	"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/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 )

@@ -14,7 +14,7 @@ import (

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

@@ -12,7 +12,7 @@ import (

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

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

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

@@ -15,7 +15,7 @@ import (

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 	"golang.org/x/net/context"

 )

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

 	"github.com/docker/docker/integration-cli/daemon"

-	"github.com/docker/docker/integration-cli/request"

 	testdaemon "github.com/docker/docker/internal/test/daemon"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/swarmkit/ca"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/assert"

@@ -242,7 +242,7 @@ func (s *DockerSwarmSuite) TestAPISwarmPromoteDemote(c *check.C) {

 	node := d1.GetNode(c, d1.NodeID())

 	node.Spec.Role = swarm.NodeRoleWorker

 	url := fmt.Sprintf("/nodes/%s/update?version=%d", node.ID, node.Version.Index)

-	res, body, err := request.DoOnHost(d1.Sock(), url, request.Method("POST"), request.JSONBody(node.Spec))

+	res, body, err := request.Post(url, request.Host(d1.Sock()), request.JSONBody(node.Spec))

 	c.Assert(err, checker.IsNil)

 	b, err := request.ReadBody(body)

 	c.Assert(err, checker.IsNil)

@@ -529,7 +529,7 @@ func (s *DockerSwarmSuite) TestAPISwarmInvalidAddress(c *check.C) {

 	req := swarm.InitRequest{

 		ListenAddr: "",

 	}

-	res, _, err := request.DoOnHost(d.Sock(), "/swarm/init", request.Method("POST"), request.JSONBody(req))

+	res, _, err := request.Post("/swarm/init", request.Host(d.Sock()), request.JSONBody(req))

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusBadRequest)

@@ -537,7 +537,7 @@ func (s *DockerSwarmSuite) TestAPISwarmInvalidAddress(c *check.C) {

 		ListenAddr:  "0.0.0.0:2377",

 		RemoteAddrs: []string{""},

 	}

-	res, _, err = request.DoOnHost(d.Sock(), "/swarm/join", request.Method("POST"), request.JSONBody(req2))

+	res, _, err = request.Post("/swarm/join", request.Host(d.Sock()), request.JSONBody(req2))

 	c.Assert(err, checker.IsNil)

 	c.Assert(res.StatusCode, checker.Equals, http.StatusBadRequest)

 }

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

 	"github.com/docker/docker/api"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

@@ -13,7 +13,7 @@ import (

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/parsers/kernel"

 	"github.com/go-check/check"

 	"github.com/kr/pty"

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

 	"strings"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

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

 	"fmt"

 	"github.com/docker/docker/integration-cli/checker"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 )

@@ -18,7 +18,7 @@ import (

 	"github.com/docker/docker/integration-cli/checker"

 	"github.com/docker/docker/integration-cli/cli"

 	"github.com/docker/docker/integration-cli/daemon"

-	"github.com/docker/docker/integration-cli/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/go-check/check"

 	"github.com/gotestyourself/gotestyourself/icmd"

 	"golang.org/x/net/context"

deleted file mode 100644

@@ -1,12 +0,0 @@

-// +build !windows

-

-package request // import "github.com/docker/docker/integration-cli/request"

-

-import (

-	"net"

-	"time"

-)

-

-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {

-	panic("npipe protocol only supported on Windows")

-}

deleted file mode 100644

@@ -1,12 +0,0 @@

-package request // import "github.com/docker/docker/integration-cli/request"

-

-import (

-	"net"

-	"time"

-

-	"github.com/Microsoft/go-winio"

-)

-

-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {

-	return winio.DialPipe(path, &timeout)

-}

deleted file mode 100644

@@ -1,230 +0,0 @@

-package request // import "github.com/docker/docker/integration-cli/request"

-

-import (

-	"bytes"

-	"crypto/tls"

-	"encoding/json"

-	"io"

-	"io/ioutil"

-	"net"

-	"net/http"

-	"net/url"

-	"os"

-	"path/filepath"

-	"strings"

-	"time"

-

-	dclient "github.com/docker/docker/client"

-	"github.com/docker/docker/opts"

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

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

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

-	"github.com/pkg/errors"

-)

-

-// Method creates a modifier that sets the specified string as the request method

-func Method(method string) func(*http.Request) error {

-	return func(req *http.Request) error {

-		req.Method = method

-		return nil

-	}

-}

-

-// RawString sets the specified string as body for the request

-func RawString(content string) func(*http.Request) error {

-	return RawContent(ioutil.NopCloser(strings.NewReader(content)))

-}

-

-// RawContent sets the specified reader as body for the request

-func RawContent(reader io.ReadCloser) func(*http.Request) error {

-	return func(req *http.Request) error {

-		req.Body = reader

-		return nil

-	}

-}

-

-// ContentType sets the specified Content-Type request header

-func ContentType(contentType string) func(*http.Request) error {

-	return func(req *http.Request) error {

-		req.Header.Set("Content-Type", contentType)

-		return nil

-	}

-}

-

-// JSON sets the Content-Type request header to json

-func JSON(req *http.Request) error {

-	return ContentType("application/json")(req)

-}

-

-// JSONBody creates a modifier that encodes the specified data to a JSON string and set it as request body. It also sets

-// the Content-Type header of the request.

-func JSONBody(data interface{}) func(*http.Request) error {

-	return func(req *http.Request) error {

-		jsonData := bytes.NewBuffer(nil)

-		if err := json.NewEncoder(jsonData).Encode(data); err != nil {

-			return err

-		}

-		req.Body = ioutil.NopCloser(jsonData)

-		req.Header.Set("Content-Type", "application/json")

-		return nil

-	}

-}

-

-// Post creates and execute a POST request on the specified host and endpoint, with the specified request modifiers

-func Post(endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {

-	return Do(endpoint, append(modifiers, Method(http.MethodPost))...)

-}

-

-// Delete creates and execute a DELETE request on the specified host and endpoint, with the specified request modifiers

-func Delete(endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {

-	return Do(endpoint, append(modifiers, Method(http.MethodDelete))...)

-}

-

-// Get creates and execute a GET request on the specified host and endpoint, with the specified request modifiers

-func Get(endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {

-	return Do(endpoint, modifiers...)

-}

-

-// Do creates and execute a request on the specified endpoint, with the specified request modifiers

-func Do(endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {

-	return DoOnHost(DaemonHost(), endpoint, modifiers...)

-}

-

-// DoOnHost creates and execute a request on the specified host and endpoint, with the specified request modifiers

-func DoOnHost(host, endpoint string, modifiers ...func(*http.Request) error) (*http.Response, io.ReadCloser, error) {

-	req, err := newRequest(host, endpoint, modifiers...)

-	if err != nil {

-		return nil, nil, err

-	}

-	client, err := newHTTPClient(host)

-	if err != nil {

-		return nil, nil, err

-	}

-	resp, err := client.Do(req)

-	var body io.ReadCloser

-	if resp != nil {

-		body = ioutils.NewReadCloserWrapper(resp.Body, func() error {

-			defer resp.Body.Close()

-			return nil

-		})

-	}

-	return resp, body, err

-}

-

-// newRequest creates a new http Request to the specified host and endpoint, with the specified request modifiers

-func newRequest(host, endpoint string, modifiers ...func(*http.Request) error) (*http.Request, error) {

-	hostUrl, err := dclient.ParseHostURL(host)

-	if err != nil {

-		return nil, errors.Wrapf(err, "failed parsing url %q", host)

-	}

-	req, err := http.NewRequest("GET", endpoint, nil)

-	if err != nil {

-		return nil, errors.Wrap(err, "failed to create request")

-	}

-

-	if os.Getenv("DOCKER_TLS_VERIFY") != "" {

-		req.URL.Scheme = "https"

-	} else {

-		req.URL.Scheme = "http"

-	}

-	req.URL.Host = hostUrl.Host

-

-	for _, config := range modifiers {

-		if err := config(req); err != nil {

-			return nil, err

-		}

-	}

-	return req, nil

-}

-

-// newHTTPClient creates an http client for the specific host

-// TODO: Share more code with client.defaultHTTPClient

-func newHTTPClient(host string) (*http.Client, error) {

-	// FIXME(vdemeester) 10*time.Second timeout of SockRequest… ?

-	hostUrl, err := dclient.ParseHostURL(host)

-	if err != nil {

-		return nil, err

-	}

-	transport := new(http.Transport)

-	if hostUrl.Scheme == "tcp" && os.Getenv("DOCKER_TLS_VERIFY") != "" {

-		// Setup the socket TLS configuration.

-		tlsConfig, err := getTLSConfig()

-		if err != nil {

-			return nil, err

-		}

-		transport = &http.Transport{TLSClientConfig: tlsConfig}

-	}

-	transport.DisableKeepAlives = true

-	err = sockets.ConfigureTransport(transport, hostUrl.Scheme, hostUrl.Host)

-	return &http.Client{Transport: transport}, err

-}

-

-// NewClient returns a new Docker API client

-// Deprecated: Use Execution.APIClient()

-func NewClient() (dclient.APIClient, error) {

-	return dclient.NewClientWithOpts(dclient.WithHost(DaemonHost()))

-}

-

-// ReadBody read the specified ReadCloser content and returns it

-func ReadBody(b io.ReadCloser) ([]byte, error) {

-	defer b.Close()

-	return ioutil.ReadAll(b)

-}

-

-// SockConn opens a connection on the specified socket

-func SockConn(timeout time.Duration, daemon string) (net.Conn, error) {

-	daemonURL, err := url.Parse(daemon)

-	if err != nil {

-		return nil, errors.Wrapf(err, "could not parse url %q", daemon)

-	}

-

-	var c net.Conn

-	switch daemonURL.Scheme {

-	case "npipe":

-		return npipeDial(daemonURL.Path, timeout)

-	case "unix":

-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Path, timeout)

-	case "tcp":

-		if os.Getenv("DOCKER_TLS_VERIFY") != "" {

-			// Setup the socket TLS configuration.

-			tlsConfig, err := getTLSConfig()

-			if err != nil {

-				return nil, err

-			}

-			dialer := &net.Dialer{Timeout: timeout}

-			return tls.DialWithDialer(dialer, daemonURL.Scheme, daemonURL.Host, tlsConfig)

-		}

-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Host, timeout)

-	default:

-		return c, errors.Errorf("unknown scheme %v (%s)", daemonURL.Scheme, daemon)

-	}

-}

-

-func getTLSConfig() (*tls.Config, error) {

-	dockerCertPath := os.Getenv("DOCKER_CERT_PATH")

-

-	if dockerCertPath == "" {

-		return nil, errors.New("DOCKER_TLS_VERIFY specified, but no DOCKER_CERT_PATH environment variable")

-	}

-

-	option := &tlsconfig.Options{

-		CAFile:   filepath.Join(dockerCertPath, "ca.pem"),

-		CertFile: filepath.Join(dockerCertPath, "cert.pem"),

-		KeyFile:  filepath.Join(dockerCertPath, "key.pem"),

-	}

-	tlsConfig, err := tlsconfig.Client(*option)

-	if err != nil {

-		return nil, err

-	}

-

-	return tlsConfig, nil

-}

-

-// DaemonHost return the daemon host string for this test execution

-func DaemonHost() string {

-	daemonURLStr := "unix://" + opts.DefaultUnixSocket

-	if daemonHostVar := os.Getenv("DOCKER_HOST"); daemonHostVar != "" {

-		daemonURLStr = daemonHostVar

-	}

-	return daemonURLStr

-}

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

 	"testing"

 	dclient "github.com/docker/docker/client"

-	"github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/internal/test/daemon"

 	"github.com/docker/docker/internal/test/fakecontext"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/moby/buildkit/session"

@@ -65,8 +65,9 @@ func TestBuildWithSession(t *testing.T) {

 	// rebuild with regular tar, confirm cache still applies

 	fctx.Add("Dockerfile", dockerfile)

 	// FIXME(vdemeester) use sock here

-	res, body, err := request.DoOnHost(d.Sock(),

+	res, body, err := request.Do(

 		"/build",

+		request.Host(d.Sock()),

 		request.Method(http.MethodPost),

 		request.RawContent(fctx.AsTarReader(t)),

 		request.ContentType("application/x-tar"))

@@ -103,14 +104,14 @@ func testBuildWithSession(t *testing.T, client dclient.APIClient, daemonSock str

 	g.Go(func() error {

 		// FIXME use sock here

-		res, body, err := request.DoOnHost(

-			daemonSock,

+		res, body, err := request.Do(

 			"/build?remote=client-session&session="+sess.ID(),

+			request.Host(daemonSock),

 			request.Method(http.MethodPost),

-			func(req *http.Request) error {

+			request.With(func(req *http.Request) error {

 				req.Body = ioutil.NopCloser(strings.NewReader(dockerfile))

 				return nil

-			},

+			}),

 		)

 		if err != nil {

 			return err

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

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

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

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

-	"github.com/docker/docker/integration/internal/request"

 	"github.com/docker/docker/internal/test/fakecontext"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

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

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/skip"

 )

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 )

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

 	"github.com/docker/docker/internal/test/daemon"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/jsonmessage"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/poll"

 )

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

 	"github.com/docker/docker/client"

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/skip"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/docker/docker/pkg/stdcopy"

 	"github.com/gotestyourself/gotestyourself/assert"

 	"github.com/gotestyourself/gotestyourself/skip"

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

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

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

 	"github.com/docker/docker/client"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

@@ -13,7 +13,7 @@ import (

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 )

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/gotestyourself/gotestyourself/assert"

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

 	"time"

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

-	req "github.com/docker/docker/integration-cli/request"

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

+	req "github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	"github.com/gotestyourself/gotestyourself/icmd"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 	"github.com/gotestyourself/gotestyourself/poll"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 )

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

 	"testing"

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

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 )

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

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

 	"github.com/docker/docker/integration/internal/container"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

@@ -5,7 +5,7 @@ import (

 	"fmt"

 	"testing"

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

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

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

deleted file mode 100644

@@ -1,42 +0,0 @@

-package request // import "github.com/docker/docker/integration/internal/request"

-

-import (

-	"fmt"

-	"testing"

-	"time"

-

-	"golang.org/x/net/context"

-

-	"github.com/docker/docker/client"

-	"github.com/docker/docker/internal/test/environment"

-	"github.com/gotestyourself/gotestyourself/assert"

-)

-

-// NewAPIClient returns a docker API client configured from environment variables

-func NewAPIClient(t *testing.T, ops ...func(*client.Client) error) client.APIClient {

-	ops = append([]func(*client.Client) error{client.FromEnv}, ops...)

-	clt, err := client.NewClientWithOpts(ops...)

-	assert.NilError(t, err)

-	return clt

-}

-

-// DaemonTime provides the current time on the daemon host

-func DaemonTime(ctx context.Context, t *testing.T, client client.APIClient, testEnv *environment.Execution) time.Time {

-	if testEnv.IsLocalDaemon() {

-		return time.Now()

-	}

-

-	info, err := client.Info(ctx)

-	assert.NilError(t, err)

-

-	dt, err := time.Parse(time.RFC3339Nano, info.SystemTime)

-	assert.NilError(t, err, "invalid time format in GET /info response")

-	return dt

-}

-

-// DaemonUnixTime returns the current time on the daemon host with nanoseconds precision.

-// It return the time formatted how the client sends timestamps to the server.

-func DaemonUnixTime(ctx context.Context, t *testing.T, client client.APIClient, testEnv *environment.Execution) string {

-	dt := DaemonTime(ctx, t, client, testEnv)

-	return fmt.Sprintf("%d.%09d", dt.Unix(), int64(dt.Nanosecond()))

-}

@@ -5,7 +5,7 @@ import (

 	"testing"

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

-	"github.com/docker/docker/integration/internal/request"

+	"github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"

 )

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

 	"net/http"

 	"testing"

-	req "github.com/docker/docker/integration-cli/request"

+	req "github.com/docker/docker/internal/test/request"

 	"github.com/gotestyourself/gotestyourself/assert"

 	is "github.com/gotestyourself/gotestyourself/assert/cmp"