Skip to content

Commit 3482b45

Browse files
vdemeestervdemeester
authored
Merge pull request moby#32647 from vdemeester/integration-runSleepingContainer-using-cli
[integration] make runSleepingContainer use cli package
2 parents cd4c089 + a899aa6 commit 3482b45

19 files changed

+61
-71
lines changed

‎integration-cli/docker_api_containers_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ func (s *DockerSuite) TestGetContainerStats(c *check.C) {
212212
}
213213

214214
func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
215-
out, _ := runSleepingContainer(c)
215+
out := runSleepingContainer(c)
216216
id := strings.TrimSpace(out)
217217

218218
buf := &testutil.ChannelBuffer{C: make(chan []byte, 1)}
@@ -401,7 +401,7 @@ func (s *DockerSuite) TestContainerAPITop(c *check.C) {
401401

402402
func (s *DockerSuite) TestContainerAPITopWindows(c *check.C) {
403403
testRequires(c, DaemonIsWindows)
404-
out, _ := runSleepingContainer(c, "-d")
404+
out := runSleepingContainer(c, "-d")
405405
id := strings.TrimSpace(string(out))
406406
c.Assert(waitRun(id), checker.IsNil)
407407

@@ -892,7 +892,7 @@ func (s *DockerSuite) TestContainerAPIRestart(c *check.C) {
892892

893893
func (s *DockerSuite) TestContainerAPIRestartNotimeoutParam(c *check.C) {
894894
name := "test-api-restart-no-timeout-param"
895-
out, _ := runSleepingContainer(c, "-di", "--name", name)
895+
out := runSleepingContainer(c, "-di", "--name", name)
896896
id := strings.TrimSpace(out)
897897
c.Assert(waitRun(id), checker.IsNil)
898898

@@ -1047,7 +1047,7 @@ func (s *DockerSuite) TestContainerAPICopyContainerNotFoundPr124(c *check.C) {
10471047
}
10481048

10491049
func (s *DockerSuite) TestContainerAPIDelete(c *check.C) {
1050-
out, _ := runSleepingContainer(c)
1050+
out := runSleepingContainer(c)
10511051

10521052
id := strings.TrimSpace(out)
10531053
c.Assert(waitRun(id), checker.IsNil)
@@ -1067,7 +1067,7 @@ func (s *DockerSuite) TestContainerAPIDeleteNotExist(c *check.C) {
10671067
}
10681068

10691069
func (s *DockerSuite) TestContainerAPIDeleteForce(c *check.C) {
1070-
out, _ := runSleepingContainer(c)
1070+
out := runSleepingContainer(c)
10711071

10721072
id := strings.TrimSpace(out)
10731073
c.Assert(waitRun(id), checker.IsNil)
@@ -1102,7 +1102,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveLinks(c *check.C) {
11021102
}
11031103

11041104
func (s *DockerSuite) TestContainerAPIDeleteConflict(c *check.C) {
1105-
out, _ := runSleepingContainer(c)
1105+
out := runSleepingContainer(c)
11061106

11071107
id := strings.TrimSpace(out)
11081108
c.Assert(waitRun(id), checker.IsNil)
@@ -1120,7 +1120,7 @@ func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {
11201120
vol = `c:\testvolume`
11211121
}
11221122

1123-
out, _ := runSleepingContainer(c, "-v", vol)
1123+
out := runSleepingContainer(c, "-v", vol)
11241124

11251125
id := strings.TrimSpace(out)
11261126
c.Assert(waitRun(id), checker.IsNil)
@@ -1158,7 +1158,7 @@ func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {
11581158
}
11591159

11601160
func (s *DockerSuite) TestContainerAPIPostContainerStop(c *check.C) {
1161-
out, _ := runSleepingContainer(c)
1161+
out := runSleepingContainer(c)
11621162

11631163
containerID := strings.TrimSpace(out)
11641164
c.Assert(waitRun(containerID), checker.IsNil)

‎integration-cli/docker_api_events_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {
4040
since := daemonTime(c).Unix()
4141
ts := strconv.FormatInt(since, 10)
4242

43-
out, _ := runSleepingContainer(c, "--name=foo", "-d")
43+
out := runSleepingContainer(c, "--name=foo", "-d")
4444
containerID := strings.TrimSpace(out)
4545
c.Assert(waitRun(containerID), checker.IsNil)
4646

‎integration-cli/docker_api_resize_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

1212
func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {
13-
out, _ := runSleepingContainer(c, "-d")
13+
out := runSleepingContainer(c, "-d")
1414
cleanedContainerID := strings.TrimSpace(out)
1515

1616
endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"
@@ -20,7 +20,7 @@ func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {
2020
}
2121

2222
func (s *DockerSuite) TestResizeAPIHeightWidthNoInt(c *check.C) {
23-
out, _ := runSleepingContainer(c, "-d")
23+
out := runSleepingContainer(c, "-d")
2424
cleanedContainerID := strings.TrimSpace(out)
2525

2626
endpoint := "/containers/" + cleanedContainerID + "/resize?h=foo&w=bar"

‎integration-cli/docker_api_stats_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (s *DockerSuite) TestAPIStatsStoppedContainerInGoroutines(c *check.C) {
9898
func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {
9999
testRequires(c, SameHostDaemon)
100100

101-
out, _ := runSleepingContainer(c)
101+
out := runSleepingContainer(c)
102102
id := strings.TrimSpace(out)
103103
c.Assert(waitRun(id), checker.IsNil)
104104

@@ -166,7 +166,7 @@ func (s *DockerSuite) TestAPIStatsNetworkStatsVersioning(c *check.C) {
166166
// Windows doesn't support API versions less than 1.25, so no point testing 1.17 .. 1.21
167167
testRequires(c, SameHostDaemon, DaemonIsLinux)
168168

169-
out, _ := runSleepingContainer(c)
169+
out := runSleepingContainer(c)
170170
id := strings.TrimSpace(out)
171171
c.Assert(waitRun(id), checker.IsNil)
172172
wg := sync.WaitGroup{}
@@ -274,11 +274,11 @@ func (s *DockerSuite) TestAPIStatsContainerNotFound(c *check.C) {
274274
func (s *DockerSuite) TestAPIStatsNoStreamConnectedContainers(c *check.C) {
275275
testRequires(c, DaemonIsLinux)
276276

277-
out1, _ := runSleepingContainer(c)
277+
out1 := runSleepingContainer(c)
278278
id1 := strings.TrimSpace(out1)
279279
c.Assert(waitRun(id1), checker.IsNil)
280280

281-
out2, _ := runSleepingContainer(c, "--net", "container:"+id1)
281+
out2 := runSleepingContainer(c, "--net", "container:"+id1)
282282
id2 := strings.TrimSpace(out2)
283283
c.Assert(waitRun(id2), checker.IsNil)
284284

‎integration-cli/docker_cli_cp_utils.go renamed to ‎integration-cli/docker_cli_cp_utils_test.go

File renamed without changes.

‎integration-cli/docker_cli_events_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ func (s *DockerSuite) TestEventsCommit(c *check.C) {
452452
// Problematic on Windows as cannot commit a running container
453453
testRequires(c, DaemonIsLinux)
454454

455-
out, _ := runSleepingContainer(c)
455+
out := runSleepingContainer(c)
456456
cID := strings.TrimSpace(out)
457457
cli.WaitRun(c, cID)
458458

@@ -495,7 +495,7 @@ func (s *DockerSuite) TestEventsCopy(c *check.C) {
495495
}
496496

497497
func (s *DockerSuite) TestEventsResize(c *check.C) {
498-
out, _ := runSleepingContainer(c, "-d")
498+
out := runSleepingContainer(c, "-d")
499499
cID := strings.TrimSpace(out)
500500
c.Assert(waitRun(cID), checker.IsNil)
501501

@@ -561,7 +561,7 @@ func (s *DockerSuite) TestEventsTop(c *check.C) {
561561
// Problematic on Windows as Windows does not support top
562562
testRequires(c, DaemonIsLinux)
563563

564-
out, _ := runSleepingContainer(c, "-d")
564+
out := runSleepingContainer(c, "-d")
565565
cID := strings.TrimSpace(out)
566566
c.Assert(waitRun(cID), checker.IsNil)
567567

‎integration-cli/docker_cli_exec_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func (s *DockerSuite) TestExecInteractive(c *check.C) {
7171
}
7272

7373
func (s *DockerSuite) TestExecAfterContainerRestart(c *check.C) {
74-
out, _ := runSleepingContainer(c)
74+
out := runSleepingContainer(c)
7575
cleanedContainerID := strings.TrimSpace(out)
7676
c.Assert(waitRun(cleanedContainerID), check.IsNil)
7777
dockerCmd(c, "restart", cleanedContainerID)
@@ -139,7 +139,7 @@ func (s *DockerSuite) TestExecExitStatus(c *check.C) {
139139
func (s *DockerSuite) TestExecPausedContainer(c *check.C) {
140140
testRequires(c, IsPausable)
141141

142-
out, _ := runSleepingContainer(c, "-d", "--name", "testing")
142+
out := runSleepingContainer(c, "-d", "--name", "testing")
143143
ContainerID := strings.TrimSpace(out)
144144

145145
dockerCmd(c, "pause", "testing")
@@ -305,7 +305,7 @@ func (s *DockerSuite) TestExecCgroup(c *check.C) {
305305
}
306306

307307
func (s *DockerSuite) TestExecInspectID(c *check.C) {
308-
out, _ := runSleepingContainer(c, "-d")
308+
out := runSleepingContainer(c, "-d")
309309
id := strings.TrimSuffix(out, "\n")
310310

311311
out = inspectField(c, id, "ExecIDs")

‎integration-cli/docker_cli_info_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (s *DockerSuite) TestInfoDisplaysRunningContainers(c *check.C) {
146146
func (s *DockerSuite) TestInfoDisplaysPausedContainers(c *check.C) {
147147
testRequires(c, IsPausable)
148148

149-
out, _ := runSleepingContainer(c, "-d")
149+
out := runSleepingContainer(c, "-d")
150150
cleanedContainerID := strings.TrimSpace(out)
151151

152152
dockerCmd(c, "pause", cleanedContainerID)

‎integration-cli/docker_cli_inspect_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (s *DockerSuite) TestInspectDefault(c *check.C) {
5353
}
5454

5555
func (s *DockerSuite) TestInspectStatus(c *check.C) {
56-
out, _ := runSleepingContainer(c, "-d")
56+
out := runSleepingContainer(c, "-d")
5757
out = strings.TrimSpace(out)
5858

5959
inspectOut := inspectField(c, out, "State.Status")

‎integration-cli/docker_cli_kill_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
func (s *DockerSuite) TestKillContainer(c *check.C) {
17-
out, _ := runSleepingContainer(c, "-d")
17+
out := runSleepingContainer(c, "-d")
1818
cleanedContainerID := strings.TrimSpace(out)
1919
cli.WaitRun(c, cleanedContainerID)
2020

@@ -27,7 +27,7 @@ func (s *DockerSuite) TestKillContainer(c *check.C) {
2727
}
2828

2929
func (s *DockerSuite) TestKillOffStoppedContainer(c *check.C) {
30-
out, _ := runSleepingContainer(c, "-d")
30+
out := runSleepingContainer(c, "-d")
3131
cleanedContainerID := strings.TrimSpace(out)
3232

3333
cli.DockerCmd(c, "stop", cleanedContainerID)
@@ -103,7 +103,7 @@ func (s *DockerSuite) TestKillWithStopSignalWithDifferentSignalShouldKeepRestart
103103

104104
// FIXME(vdemeester) should be a unit test
105105
func (s *DockerSuite) TestKillWithInvalidSignal(c *check.C) {
106-
out, _ := runSleepingContainer(c, "-d")
106+
out := runSleepingContainer(c, "-d")
107107
cid := strings.TrimSpace(out)
108108
c.Assert(waitRun(cid), check.IsNil)
109109

@@ -114,7 +114,7 @@ func (s *DockerSuite) TestKillWithInvalidSignal(c *check.C) {
114114
running := inspectField(c, cid, "State.Running")
115115
c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after an invalid signal"))
116116

117-
out, _ = runSleepingContainer(c, "-d")
117+
out = runSleepingContainer(c, "-d")
118118
cid = strings.TrimSpace(out)
119119
c.Assert(waitRun(cid), check.IsNil)
120120

‎integration-cli/docker_cli_network_unix_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkCreateHostBind(c *check.C) {
334334
dockerCmd(c, "network", "create", "--subnet=192.168.10.0/24", "--gateway=192.168.10.1", "-o", "com.docker.network.bridge.host_binding_ipv4=192.168.10.1", "testbind")
335335
assertNwIsAvailable(c, "testbind")
336336

337-
out, _ := runSleepingContainer(c, "--net=testbind", "-p", "5000:5000")
337+
out := runSleepingContainer(c, "--net=testbind", "-p", "5000:5000")
338338
id := strings.TrimSpace(out)
339339
c.Assert(waitRun(id), checker.IsNil)
340340
out, _ = dockerCmd(c, "ps")

‎integration-cli/docker_cli_ps_test.go

+17-27
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ import (
1919
)
2020

2121
func (s *DockerSuite) TestPsListContainersBase(c *check.C) {
22-
out, _ := runSleepingContainer(c, "-d")
22+
out := runSleepingContainer(c, "-d")
2323
firstID := strings.TrimSpace(out)
2424

25-
out, _ = runSleepingContainer(c, "-d")
25+
out = runSleepingContainer(c, "-d")
2626
secondID := strings.TrimSpace(out)
2727

2828
// not long running
2929
out, _ = dockerCmd(c, "run", "-d", "busybox", "true")
3030
thirdID := strings.TrimSpace(out)
3131

32-
out, _ = runSleepingContainer(c, "-d")
32+
out = runSleepingContainer(c, "-d")
3333
fourthID := strings.TrimSpace(out)
3434

3535
// make sure the second is running
@@ -228,7 +228,7 @@ func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) {
228228

229229
func (s *DockerSuite) TestPsListContainersFilterHealth(c *check.C) {
230230
// Test legacy no health check
231-
out, _ := runSleepingContainer(c, "--name=none_legacy")
231+
out := runSleepingContainer(c, "--name=none_legacy")
232232
containerID := strings.TrimSpace(out)
233233

234234
cli.WaitRun(c, containerID)
@@ -238,7 +238,7 @@ func (s *DockerSuite) TestPsListContainersFilterHealth(c *check.C) {
238238
c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected id %s, got %s for legacy none filter, output: %q", containerID, containerOut, out))
239239

240240
// Test no health check specified explicitly
241-
out, _ = runSleepingContainer(c, "--name=none", "--no-healthcheck")
241+
out = runSleepingContainer(c, "--name=none", "--no-healthcheck")
242242
containerID = strings.TrimSpace(out)
243243

244244
cli.WaitRun(c, containerID)
@@ -248,7 +248,7 @@ func (s *DockerSuite) TestPsListContainersFilterHealth(c *check.C) {
248248
c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected id %s, got %s for none filter, output: %q", containerID, containerOut, out))
249249

250250
// Test failing health check
251-
out, _ = runSleepingContainer(c, "--name=failing_container", "--health-cmd=exit 1", "--health-interval=1s")
251+
out = runSleepingContainer(c, "--name=failing_container", "--health-cmd=exit 1", "--health-interval=1s")
252252
containerID = strings.TrimSpace(out)
253253

254254
waitForHealthStatus(c, "failing_container", "starting", "unhealthy")
@@ -258,7 +258,7 @@ func (s *DockerSuite) TestPsListContainersFilterHealth(c *check.C) {
258258
c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected containerID %s, got %s for unhealthy filter, output: %q", containerID, containerOut, out))
259259

260260
// Check passing healthcheck
261-
out, _ = runSleepingContainer(c, "--name=passing_container", "--health-cmd=exit 0", "--health-interval=1s")
261+
out = runSleepingContainer(c, "--name=passing_container", "--health-cmd=exit 0", "--health-interval=1s")
262262
containerID = strings.TrimSpace(out)
263263

264264
waitForHealthStatus(c, "passing_container", "starting", "healthy")
@@ -473,19 +473,19 @@ func (s *DockerSuite) TestPsRightTagName(c *check.C) {
473473
dockerCmd(c, "tag", "busybox", tag)
474474

475475
var id1 string
476-
out, _ := runSleepingContainer(c)
476+
out := runSleepingContainer(c)
477477
id1 = strings.TrimSpace(string(out))
478478

479479
var id2 string
480-
out, _ = runSleepingContainerInImage(c, tag)
480+
out = runSleepingContainerInImage(c, tag)
481481
id2 = strings.TrimSpace(string(out))
482482

483483
var imageID string
484484
out = inspectField(c, "busybox", "Id")
485485
imageID = strings.TrimSpace(string(out))
486486

487487
var id3 string
488-
out, _ = runSleepingContainerInImage(c, imageID)
488+
out = runSleepingContainerInImage(c, imageID)
489489
id3 = strings.TrimSpace(string(out))
490490

491491
out, _ = dockerCmd(c, "ps", "--no-trunc")
@@ -638,7 +638,7 @@ func (s *DockerSuite) TestPsDefaultFormatAndQuiet(c *check.C) {
638638
err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
639639
c.Assert(err, checker.IsNil)
640640

641-
out, _ := runSleepingContainer(c, "--name=test")
641+
out := runSleepingContainer(c, "--name=test")
642642
id := strings.TrimSpace(out)
643643

644644
out, _ = dockerCmd(c, "--config", d, "ps", "-q")
@@ -898,35 +898,25 @@ func (s *DockerSuite) TestPsListContainersFilterNetwork(c *check.C) {
898898

899899
func (s *DockerSuite) TestPsByOrder(c *check.C) {
900900
name1 := "xyz-abc"
901-
out, err := runSleepingContainer(c, "--name", name1)
902-
c.Assert(err, checker.NotNil)
903-
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
901+
out := runSleepingContainer(c, "--name", name1)
904902
container1 := strings.TrimSpace(out)
905903

906904
name2 := "xyz-123"
907-
out, err = runSleepingContainer(c, "--name", name2)
908-
c.Assert(err, checker.NotNil)
909-
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
905+
out = runSleepingContainer(c, "--name", name2)
910906
container2 := strings.TrimSpace(out)
911907

912908
name3 := "789-abc"
913-
out, err = runSleepingContainer(c, "--name", name3)
914-
c.Assert(err, checker.NotNil)
915-
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
909+
out = runSleepingContainer(c, "--name", name3)
916910

917911
name4 := "789-123"
918-
out, err = runSleepingContainer(c, "--name", name4)
919-
c.Assert(err, checker.NotNil)
920-
c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
912+
out = runSleepingContainer(c, "--name", name4)
921913

922914
// Run multiple time should have the same result
923-
out, err = dockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz")
924-
c.Assert(err, checker.NotNil)
915+
out = cli.DockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz").Combined()
925916
c.Assert(strings.TrimSpace(out), checker.Equals, fmt.Sprintf("%s\n%s", container2, container1))
926917

927918
// Run multiple time should have the same result
928-
out, err = dockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz")
929-
c.Assert(err, checker.NotNil)
919+
out = cli.DockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz").Combined()
930920
c.Assert(strings.TrimSpace(out), checker.Equals, fmt.Sprintf("%s\n%s", container2, container1))
931921
}
932922

0 commit comments

Comments
 (0)