Skip to content

Commit b958b43

Browse files
yongtangyongtang
authored
Merge pull request moby#38417 from thaJeztah/replace_newclient
Test: Replace NewClient() with NewClientT()
2 parents 0104abf + 2cb7b73 commit b958b43

File tree

19 files changed

+200
-241
lines changed

19 files changed

+200
-241
lines changed

‎integration-cli/daemon/daemon_swarm.go‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ func (d *Daemon) CheckServiceUpdateState(service string) func(*check.C) (interfa
6767
// CheckPluginRunning returns the runtime state of the plugin
6868
func (d *Daemon) CheckPluginRunning(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {
6969
return func(c *check.C) (interface{}, check.CommentInterface) {
70-
apiclient, err := d.NewClient()
71-
assert.NilError(c, err)
70+
apiclient := d.NewClientT(c)
7271
resp, _, err := apiclient.PluginInspectWithRaw(context.Background(), plugin)
7372
if client.IsErrNotFound(err) {
7473
return false, check.Commentf("%v", err)
@@ -81,8 +80,7 @@ func (d *Daemon) CheckPluginRunning(plugin string) func(c *check.C) (interface{}
8180
// CheckPluginImage returns the runtime state of the plugin
8281
func (d *Daemon) CheckPluginImage(plugin string) func(c *check.C) (interface{}, check.CommentInterface) {
8382
return func(c *check.C) (interface{}, check.CommentInterface) {
84-
apiclient, err := d.NewClient()
85-
assert.NilError(c, err)
83+
apiclient := d.NewClientT(c)
8684
resp, _, err := apiclient.PluginInspectWithRaw(context.Background(), plugin)
8785
if client.IsErrNotFound(err) {
8886
return false, check.Commentf("%v", err)
@@ -102,8 +100,7 @@ func (d *Daemon) CheckServiceTasks(service string) func(*check.C) (interface{},
102100

103101
// CheckRunningTaskNetworks returns the number of times each network is referenced from a task.
104102
func (d *Daemon) CheckRunningTaskNetworks(c *check.C) (interface{}, check.CommentInterface) {
105-
cli, err := d.NewClient()
106-
c.Assert(err, checker.IsNil)
103+
cli := d.NewClientT(c)
107104
defer cli.Close()
108105

109106
filterArgs := filters.NewArgs()
@@ -127,8 +124,7 @@ func (d *Daemon) CheckRunningTaskNetworks(c *check.C) (interface{}, check.Commen
127124

128125
// CheckRunningTaskImages returns the times each image is running as a task.
129126
func (d *Daemon) CheckRunningTaskImages(c *check.C) (interface{}, check.CommentInterface) {
130-
cli, err := d.NewClient()
131-
c.Assert(err, checker.IsNil)
127+
cli := d.NewClientT(c)
132128
defer cli.Close()
133129

134130
filterArgs := filters.NewArgs()
@@ -177,8 +173,7 @@ func (d *Daemon) CheckControlAvailable(c *check.C) (interface{}, check.CommentIn
177173

178174
// CheckLeader returns whether there is a leader on the swarm or not
179175
func (d *Daemon) CheckLeader(c *check.C) (interface{}, check.CommentInterface) {
180-
cli, err := d.NewClient()
181-
c.Assert(err, checker.IsNil)
176+
cli := d.NewClientT(c)
182177
defer cli.Close()
183178

184179
errList := check.Commentf("could not get node list")

‎integration-cli/docker_api_swarm_service_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,20 +66,19 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesCreate(c *check.C) {
6666
id := d.CreateService(c, simpleTestService, setInstances(instances))
6767
waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, instances)
6868

69-
cli, err := d.NewClient()
70-
c.Assert(err, checker.IsNil)
71-
defer cli.Close()
69+
client := d.NewClientT(c)
70+
defer client.Close()
7271

7372
options := types.ServiceInspectOptions{InsertDefaults: true}
7473

7574
// insertDefaults inserts UpdateConfig when service is fetched by ID
76-
resp, _, err := cli.ServiceInspectWithRaw(context.Background(), id, options)
75+
resp, _, err := client.ServiceInspectWithRaw(context.Background(), id, options)
7776
out := fmt.Sprintf("%+v", resp)
7877
c.Assert(err, checker.IsNil)
7978
c.Assert(out, checker.Contains, "UpdateConfig")
8079

8180
// insertDefaults inserts UpdateConfig when service is fetched by ID
82-
resp, _, err = cli.ServiceInspectWithRaw(context.Background(), "top", options)
81+
resp, _, err = client.ServiceInspectWithRaw(context.Background(), "top", options)
8382
out = fmt.Sprintf("%+v", resp)
8483
c.Assert(err, checker.IsNil)
8584
c.Assert(string(out), checker.Contains, "UpdateConfig")

‎integration-cli/docker_api_swarm_test.go‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -392,13 +392,12 @@ func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {
392392
var service swarm.Service
393393
simpleTestService(&service)
394394
service.Spec.Name = "top2"
395-
cli, err := d1.NewClient()
396-
c.Assert(err, checker.IsNil)
395+
cli := d1.NewClientT(c)
397396
defer cli.Close()
398397

399398
// d1 will eventually step down from leader because there is no longer an active quorum, wait for that to happen
400399
waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
401-
_, err = cli.ServiceCreate(context.Background(), service.Spec, types.ServiceCreateOptions{})
400+
_, err := cli.ServiceCreate(context.Background(), service.Spec, types.ServiceCreateOptions{})
402401
return err.Error(), nil
403402
}, checker.Contains, "Make sure more than half of the managers are online.")
404403

@@ -864,10 +863,9 @@ func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateWithName(c *check.C) {
864863
instances = 5
865864

866865
setInstances(instances)(service)
867-
cli, err := d.NewClient()
868-
c.Assert(err, checker.IsNil)
866+
cli := d.NewClientT(c)
869867
defer cli.Close()
870-
_, err = cli.ServiceUpdate(context.Background(), service.Spec.Name, service.Version, service.Spec, types.ServiceUpdateOptions{})
868+
_, err := cli.ServiceUpdate(context.Background(), service.Spec.Name, service.Version, service.Spec, types.ServiceUpdateOptions{})
871869
c.Assert(err, checker.IsNil)
872870
waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, instances)
873871
}
@@ -899,8 +897,7 @@ func (s *DockerSwarmSuite) TestAPISwarmErrorHandling(c *check.C) {
899897
// This test makes sure the fixes correctly output scopes instead.
900898
func (s *DockerSwarmSuite) TestAPIDuplicateNetworks(c *check.C) {
901899
d := s.AddDaemon(c, true, true)
902-
cli, err := d.NewClient()
903-
c.Assert(err, checker.IsNil)
900+
cli := d.NewClientT(c)
904901
defer cli.Close()
905902

906903
name := "foo"
@@ -1029,8 +1026,7 @@ func (s *DockerSwarmSuite) TestAPINetworkInspectWithScope(c *check.C) {
10291026

10301027
name := "test-scoped-network"
10311028
ctx := context.Background()
1032-
apiclient, err := d.NewClient()
1033-
assert.NilError(c, err)
1029+
apiclient := d.NewClientT(c)
10341030

10351031
resp, err := apiclient.NetworkCreate(ctx, name, types.NetworkCreate{Driver: "overlay"})
10361032
assert.NilError(c, err)

‎integration-cli/docker_cli_swarm_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,8 +426,7 @@ func (s *DockerSwarmSuite) TestOverlayAttachableOnSwarmLeave(c *check.C) {
426426
c.Assert(err, checker.IsNil, check.Commentf("%s", out))
427427

428428
// Leave the swarm
429-
err = d.SwarmLeave(true)
430-
c.Assert(err, checker.IsNil)
429+
c.Assert(d.SwarmLeave(true), checker.IsNil)
431430

432431
// Check the container is disconnected
433432
out, err = d.Cmd("inspect", "c1", "--format", "{{.NetworkSettings.Networks."+nwName+"}}")
@@ -1620,8 +1619,7 @@ func (s *DockerSwarmSuite) TestNetworkInspectWithDuplicateNames(c *check.C) {
16201619
Driver: "bridge",
16211620
}
16221621

1623-
cli, err := d.NewClient()
1624-
c.Assert(err, checker.IsNil)
1622+
cli := d.NewClientT(c)
16251623
defer cli.Close()
16261624

16271625
n1, err := cli.NetworkCreate(context.Background(), name, options)

‎integration/container/daemon_linux_test.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,17 @@ func TestContainerStartOnDaemonRestart(t *testing.T) {
3636
d.StartWithBusybox(t, "--iptables=false")
3737
defer d.Stop(t)
3838

39-
client, err := d.NewClient()
40-
assert.Check(t, err, "error creating client")
39+
c := d.NewClientT(t)
4140

4241
ctx := context.Background()
4342

44-
cID := container.Create(t, ctx, client)
45-
defer client.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})
43+
cID := container.Create(t, ctx, c)
44+
defer c.ContainerRemove(ctx, cID, types.ContainerRemoveOptions{Force: true})
4645

47-
err = client.ContainerStart(ctx, cID, types.ContainerStartOptions{})
46+
err := c.ContainerStart(ctx, cID, types.ContainerStartOptions{})
4847
assert.Check(t, err, "error starting test container")
4948

50-
inspect, err := client.ContainerInspect(ctx, cID)
49+
inspect, err := c.ContainerInspect(ctx, cID)
5150
assert.Check(t, err, "error getting inspect data")
5251

5352
ppid := getContainerdShimPid(t, inspect)
@@ -63,7 +62,7 @@ func TestContainerStartOnDaemonRestart(t *testing.T) {
6362

6463
d.Start(t, "--iptables=false")
6564

66-
err = client.ContainerStart(ctx, cID, types.ContainerStartOptions{})
65+
err = c.ContainerStart(ctx, cID, types.ContainerStartOptions{})
6766
assert.Check(t, err, "failed to start test container")
6867
}
6968

‎integration/container/export_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,16 @@ func TestExportContainerAfterDaemonRestart(t *testing.T) {
6161
skip.If(t, testEnv.IsRemoteDaemon())
6262

6363
d := daemon.New(t)
64-
client, err := d.NewClient()
65-
assert.NilError(t, err)
64+
c := d.NewClientT(t)
6665

6766
d.StartWithBusybox(t)
6867
defer d.Stop(t)
6968

7069
ctx := context.Background()
71-
ctrID := container.Create(t, ctx, client)
70+
ctrID := container.Create(t, ctx, c)
7271

7372
d.Restart(t)
7473

75-
_, err = client.ContainerExport(ctx, ctrID)
74+
_, err := c.ContainerExport(ctx, ctrID)
7675
assert.NilError(t, err)
7776
}

‎integration/container/ipcmode_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,25 +227,24 @@ func testDaemonIpcPrivateShareable(t *testing.T, mustBeShared bool, arg ...strin
227227
d.StartWithBusybox(t, arg...)
228228
defer d.Stop(t)
229229

230-
client, err := d.NewClient()
231-
assert.Check(t, err, "error creating client")
230+
c := d.NewClientT(t)
232231

233232
cfg := containertypes.Config{
234233
Image: "busybox",
235234
Cmd: []string{"top"},
236235
}
237236
ctx := context.Background()
238237

239-
resp, err := client.ContainerCreate(ctx, &cfg, &containertypes.HostConfig{}, nil, "")
238+
resp, err := c.ContainerCreate(ctx, &cfg, &containertypes.HostConfig{}, nil, "")
240239
assert.NilError(t, err)
241240
assert.Check(t, is.Equal(len(resp.Warnings), 0))
242241

243-
err = client.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
242+
err = c.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
244243
assert.NilError(t, err)
245244

246245
// get major:minor pair for /dev/shm from container's /proc/self/mountinfo
247246
cmd := "awk '($5 == \"/dev/shm\") {printf $3}' /proc/self/mountinfo"
248-
result, err := container.Exec(ctx, client, resp.ID, []string{"sh", "-c", cmd})
247+
result, err := container.Exec(ctx, c, resp.ID, []string{"sh", "-c", cmd})
249248
assert.NilError(t, err)
250249
mm := result.Combined()
251250
assert.Check(t, is.Equal(true, regexp.MustCompile("^[0-9]+:[0-9]+$").MatchString(mm)))

‎integration/container/restart_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ func TestDaemonRestartKillContainers(t *testing.T) {
2626
xStart bool
2727
}
2828

29-
for _, c := range []testCase{
29+
for _, tc := range []testCase{
3030
{
3131
desc: "container without restart policy",
3232
config: &container.Config{Image: "busybox", Cmd: []string{"top"}},
@@ -57,16 +57,15 @@ func TestDaemonRestartKillContainers(t *testing.T) {
5757
d.Stop(t)
5858
},
5959
} {
60-
t.Run(fmt.Sprintf("live-restore=%v/%s/%s", liveRestoreEnabled, c.desc, fnName), func(t *testing.T) {
61-
c := c
60+
t.Run(fmt.Sprintf("live-restore=%v/%s/%s", liveRestoreEnabled, tc.desc, fnName), func(t *testing.T) {
61+
c := tc
6262
liveRestoreEnabled := liveRestoreEnabled
6363
stopDaemon := stopDaemon
6464

6565
t.Parallel()
6666

6767
d := daemon.New(t)
68-
client, err := d.NewClient()
69-
assert.NilError(t, err)
68+
client := d.NewClientT(t)
7069

7170
args := []string{"--iptables=false"}
7271
if liveRestoreEnabled {

‎integration/network/ipvlan/ipvlan_test.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,18 @@ func TestDockerNetworkIpvlanPersistance(t *testing.T) {
3232
n.CreateMasterDummy(t, master)
3333
defer n.DeleteInterface(t, master)
3434

35-
client, err := d.NewClient()
36-
assert.NilError(t, err)
35+
c := d.NewClientT(t)
3736

3837
// create a network specifying the desired sub-interface name
3938
netName := "di-persist"
40-
net.CreateNoError(t, context.Background(), client, netName,
39+
net.CreateNoError(t, context.Background(), c, netName,
4140
net.WithIPvlan("di-dummy0.70", ""),
4241
)
4342

44-
assert.Check(t, n.IsNetworkAvailable(client, netName))
43+
assert.Check(t, n.IsNetworkAvailable(c, netName))
4544
// Restart docker daemon to test the config has persisted to disk
4645
d.Restart(t)
47-
assert.Check(t, n.IsNetworkAvailable(client, netName))
46+
assert.Check(t, n.IsNetworkAvailable(c, netName))
4847
}
4948

5049
func TestDockerNetworkIpvlan(t *testing.T) {
@@ -87,11 +86,9 @@ func TestDockerNetworkIpvlan(t *testing.T) {
8786
} {
8887
d := daemon.New(t, daemon.WithExperimental)
8988
d.StartWithBusybox(t)
89+
c := d.NewClientT(t)
9090

91-
client, err := d.NewClient()
92-
assert.NilError(t, err)
93-
94-
t.Run(tc.name, tc.test(client))
91+
t.Run(tc.name, tc.test(c))
9592

9693
d.Stop(t)
9794
// FIXME(vdemeester) clean network

‎integration/network/macvlan/macvlan_test.go‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,15 @@ func TestDockerNetworkMacvlanPersistance(t *testing.T) {
3030
n.CreateMasterDummy(t, master)
3131
defer n.DeleteInterface(t, master)
3232

33-
client, err := d.NewClient()
34-
assert.NilError(t, err)
33+
c := d.NewClientT(t)
3534

3635
netName := "dm-persist"
37-
net.CreateNoError(t, context.Background(), client, netName,
36+
net.CreateNoError(t, context.Background(), c, netName,
3837
net.WithMacvlan("dm-dummy0.60"),
3938
)
40-
assert.Check(t, n.IsNetworkAvailable(client, netName))
39+
assert.Check(t, n.IsNetworkAvailable(c, netName))
4140
d.Restart(t)
42-
assert.Check(t, n.IsNetworkAvailable(client, netName))
41+
assert.Check(t, n.IsNetworkAvailable(c, netName))
4342
}
4443

4544
func TestDockerNetworkMacvlan(t *testing.T) {
@@ -69,11 +68,9 @@ func TestDockerNetworkMacvlan(t *testing.T) {
6968
} {
7069
d := daemon.New(t)
7170
d.StartWithBusybox(t)
71+
c := d.NewClientT(t)
7272

73-
client, err := d.NewClient()
74-
assert.NilError(t, err)
75-
76-
t.Run(tc.name, tc.test(client))
73+
t.Run(tc.name, tc.test(c))
7774

7875
d.Stop(t)
7976
// FIXME(vdemeester) clean network

0 commit comments

Comments
 (0)