beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #38604 from thaJeztah/remove_deprecated_newclient

Browse source 
Remove use of deprecated client.NewClient()
This commit is contained in:
Yong Tang 2019-01-28 13:06:06 -08:00 committed by GitHub
commit 0d9dc3f4b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/hijack_test.go
View file

@ -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"}})

3
integration-cli/docker_api_containers_test.go
View file

@ -1443,8 +1443,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{})

5
integration-cli/docker_cli_daemon_test.go
View file

@ -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, testEnv.IsLocalDaemon)
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()