From 3153dc5a378badc27557eb5242562e94912d84ae Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 21 Jan 2019 12:32:56 +0100 Subject: [PATCH] Remove use of deprecated client.NewClient() Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3a4bb96ab74125c95702b818725ba92a27e3a450) Signed-off-by: Sebastiaan van Stijn Upstream-commit: fd6a4681ee906890145556a497a81a914c6aed75 Component: engine --- components/engine/client/hijack_test.go | 2 +- .../engine/integration-cli/docker_api_containers_test.go | 3 +-- components/engine/integration-cli/docker_cli_daemon_test.go | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/components/engine/client/hijack_test.go b/components/engine/client/hijack_test.go index bc3b158fef..255f818501 100644 --- a/components/engine/client/hijack_test.go +++ b/components/engine/client/hijack_test.go @@ -78,7 +78,7 @@ func TestTLSCloseWriter(t *testing.T) { serverURL, err := url.Parse(ts.URL) assert.NilError(t, err) - client, err := NewClient("tcp://"+serverURL.Host, "", ts.Client(), nil) + client, err := NewClientWithOpts(WithHost("tcp://"+serverURL.Host), WithHTTPClient(ts.Client())) assert.NilError(t, err) resp, err := client.postHijacked(context.Background(), "/asdf", url.Values{}, nil, map[string][]string{"Content-Type": {"text/plain"}}) diff --git a/components/engine/integration-cli/docker_api_containers_test.go b/components/engine/integration-cli/docker_api_containers_test.go index 4bd0c1bb54..164877bc2b 100644 --- a/components/engine/integration-cli/docker_api_containers_test.go +++ b/components/engine/integration-cli/docker_api_containers_test.go @@ -1441,8 +1441,7 @@ func (s *DockerSuite) TestPutContainerArchiveErrSymlinkInVolumeToReadOnlyRootfs( // Attempt to extract to a symlink in the volume which points to a // directory outside the volume. This should cause an error because the // rootfs is read-only. - var httpClient *http.Client - cli, err := client.NewClient(request.DaemonHost(), "v1.20", httpClient, map[string]string{}) + cli, err := client.NewClientWithOpts(client.FromEnv, client.WithVersion("v1.20")) c.Assert(err, checker.IsNil) err = cli.CopyToContainer(context.Background(), cID, "/vol2/symlinkToAbsDir", nil, types.CopyToContainerOptions{}) diff --git a/components/engine/integration-cli/docker_cli_daemon_test.go b/components/engine/integration-cli/docker_cli_daemon_test.go index 6431280732..a1944af493 100644 --- a/components/engine/integration-cli/docker_cli_daemon_test.go +++ b/components/engine/integration-cli/docker_cli_daemon_test.go @@ -24,9 +24,7 @@ import ( "time" "github.com/cloudflare/cfssl/helpers" - "github.com/docker/docker/api" "github.com/docker/docker/api/types" - "github.com/docker/docker/client" moby_daemon "github.com/docker/docker/daemon" "github.com/docker/docker/integration-cli/checker" "github.com/docker/docker/integration-cli/cli" @@ -3007,8 +3005,7 @@ func (s *DockerDaemonSuite) TestFailedPluginRemove(c *check.C) { testRequires(c, DaemonIsLinux, IsAmd64, SameHostDaemon) d := daemon.New(c, dockerBinary, dockerdBinary) d.Start(c) - cli, err := client.NewClient(d.Sock(), api.DefaultVersion, nil, nil) - c.Assert(err, checker.IsNil) + cli := d.NewClientT(c) ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second) defer cancel()