Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 6b761db

Browse files
carmarkcarmark
committed
fix integration run issues
1 parent ad336c2 commit 6b761db

21 files changed

+305
-96
lines changed

‎integration-cli/final/cli/hyper_cli_create_test.go‎

100755100644
Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,20 @@ import (
88
"strings"
99
"time"
1010

11-
// "os/exec"
12-
13-
// "io/ioutil"
14-
1511
"github.com/docker/docker/pkg/integration/checker"
1612
"github.com/go-check/check"
1713
)
1814

1915
// Make sure we can create a simple container with some args
2016
func (s *DockerSuite) TestCreateArgs(c *check.C) {
21-
printTestCaseName(); defer printTestDuration(time.Now())
17+
printTestCaseName()
18+
defer printTestDuration(time.Now())
2219
// TODO Windows. This requires further investigation for porting to
2320
// Windows CI. Currently fails.
2421
if daemonPlatform == "windows" {
2522
c.Skip("Fails on Windows CI")
2623
}
24+
pullImageIfNotExist("busybox")
2725
out, _ := dockerCmd(c, "create", "busybox", "command", "arg1", "arg2", "arg with space")
2826

2927
cleanedContainerID := getIDfromOutput(c, out)
@@ -61,7 +59,9 @@ func (s *DockerSuite) TestCreateArgs(c *check.C) {
6159

6260
// Make sure we can set hostconfig options too
6361
func (s *DockerSuite) TestCreateHostConfig(c *check.C) {
64-
printTestCaseName(); defer printTestDuration(time.Now())
62+
printTestCaseName()
63+
defer printTestDuration(time.Now())
64+
pullImageIfNotExist("busybox")
6565
out, _ := dockerCmd(c, "create", "busybox", "echo")
6666

6767
cleanedContainerID := getIDfromOutput(c, out)
@@ -85,18 +85,21 @@ func (s *DockerSuite) TestCreateHostConfig(c *check.C) {
8585

8686
// "test123" should be printed by docker create + start
8787
func (s *DockerSuite) TestCreateEchoStdout(c *check.C) {
88-
printTestCaseName(); defer printTestDuration(time.Now())
88+
printTestCaseName()
89+
defer printTestDuration(time.Now())
90+
pullImageIfNotExist("busybox")
8991
out, _ := dockerCmd(c, "create", "busybox", "echo", "test123")
9092

9193
cleanedContainerID := getIDfromOutput(c, out)
9294

9395
out, _ = dockerCmd(c, "start", "-ai", cleanedContainerID)
94-
time.Sleep( 5 * time.Second )
96+
time.Sleep(5 * time.Second)
9597
c.Assert(out, checker.Equals, "test123\n", check.Commentf("container should've printed 'test123', got %q", out))
9698
}
9799

98100
func (s *DockerSuite) TestCreateVolumesCreated(c *check.C) {
99-
printTestCaseName(); defer printTestDuration(time.Now())
101+
printTestCaseName()
102+
defer printTestDuration(time.Now())
100103
testRequires(c, SameHostDaemon)
101104
prefix := "/"
102105
if daemonPlatform == "windows" {
@@ -119,7 +122,8 @@ func (s *DockerSuite) TestCreateVolumesCreated(c *check.C) {
119122
}
120123

121124
func (s *DockerSuite) TestCreateLabels(c *check.C) {
122-
printTestCaseName(); defer printTestDuration(time.Now())
125+
printTestCaseName()
126+
defer printTestDuration(time.Now())
123127
name := "test-create-labels"
124128
expected := map[string]string{"k1": "v1", "k2": "v2", "sh.hyper.fip": "", "sh_hyper_instancetype": "xs"}
125129
dockerCmd(c, "create", "--name", name, "-l", "k1=v1", "--label", "k2=v2", "busybox")
@@ -132,13 +136,14 @@ func (s *DockerSuite) TestCreateLabels(c *check.C) {
132136
}
133137
}
134138

135-
136139
func (s *DockerSuite) TestCreateRM(c *check.C) {
137-
printTestCaseName(); defer printTestDuration(time.Now())
140+
printTestCaseName()
141+
defer printTestDuration(time.Now())
138142
// Test to make sure we can 'rm' a new container that is in
139143
// "Created" state, and has ever been run. Test "rm -f" too.
140144

141145
// create a container
146+
pullImageIfNotExist("busybox")
142147
out, _ := dockerCmd(c, "create", "busybox")
143148
cID := getIDfromOutput(c, out)
144149

@@ -152,11 +157,13 @@ func (s *DockerSuite) TestCreateRM(c *check.C) {
152157
}
153158

154159
func (s *DockerSuite) TestCreateModeIpcContainer(c *check.C) {
155-
printTestCaseName(); defer printTestDuration(time.Now())
160+
printTestCaseName()
161+
defer printTestDuration(time.Now())
156162
// Uses Linux specific functionality (--ipc)
157163
testRequires(c, DaemonIsLinux)
158164
testRequires(c, SameHostDaemon, NotUserNamespace)
159165

166+
pullImageIfNotExist("busybox")
160167
out, _ := dockerCmd(c, "create", "busybox")
161168
id := strings.TrimSpace(out)
162169

@@ -299,7 +306,8 @@ func (s *DockerTrustSuite) TestTrustedCreateFromBadTrustServer(c *check.C) {
299306
*/
300307

301308
func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {
302-
printTestCaseName(); defer printTestDuration(time.Now())
309+
printTestCaseName()
310+
defer printTestDuration(time.Now())
303311
// TODO Windows. This requires further investigation for porting to
304312
// Windows CI. Currently fails.
305313
if daemonPlatform == "windows" {

‎integration-cli/final/cli/hyper_cli_inspect_test.go‎

Lines changed: 42 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ func checkValidGraphDriver(c *check.C, name string) {
1919
}
2020

2121
func (s *DockerSuite) TestInspectImage(c *check.C) {
22-
printTestCaseName(); defer printTestDuration(time.Now())
22+
printTestCaseName()
23+
defer printTestDuration(time.Now())
2324
testRequires(c, DaemonIsLinux)
2425
imageTest := "busybox"
2526
ensureImageExist(c, imageTest)
@@ -29,14 +30,15 @@ func (s *DockerSuite) TestInspectImage(c *check.C) {
2930
// fails, fix the difference in the image serialization instead of
3031
// updating this hash.
3132
// Warning: before test , make sure imageTest and imageTestId are match
32-
imageTestID := "sha256:47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb"
33+
imageTestID := "sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749"
3334
id := inspectField(c, imageTest, "Id")
3435

3536
c.Assert(id, checker.Equals, imageTestID)
3637
}
3738

3839
func (s *DockerSuite) TestInspectInt64(c *check.C) {
39-
printTestCaseName(); defer printTestDuration(time.Now())
40+
printTestCaseName()
41+
defer printTestDuration(time.Now())
4042
testRequires(c, DaemonIsLinux)
4143

4244
dockerCmd(c, "run", "-d", "--name", "inspect-test", "busybox", "true")
@@ -45,7 +47,8 @@ func (s *DockerSuite) TestInspectInt64(c *check.C) {
4547
}
4648

4749
func (s *DockerSuite) TestInspectDefault(c *check.C) {
48-
printTestCaseName(); defer printTestDuration(time.Now())
50+
printTestCaseName()
51+
defer printTestDuration(time.Now())
4952
testRequires(c, DaemonIsLinux)
5053
//Both the container and image are named busybox. docker inspect will fetch the container JSON.
5154
//If the container JSON is not available, it will go for the image JSON.
@@ -58,8 +61,9 @@ func (s *DockerSuite) TestInspectDefault(c *check.C) {
5861
}
5962

6063
func (s *DockerSuite) TestInspectStatus(c *check.C) {
61-
printTestCaseName(); defer printTestDuration(time.Now())
62-
// defer unpauseAllContainers()
64+
printTestCaseName()
65+
defer printTestDuration(time.Now())
66+
// defer unpauseAllContainers()
6367
testRequires(c, DaemonIsLinux)
6468
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
6569
out = getIDfromOutput(c, out)
@@ -74,7 +78,8 @@ func (s *DockerSuite) TestInspectStatus(c *check.C) {
7478
}
7579

7680
func (s *DockerSuite) TestInspectTypeFlagContainer(c *check.C) {
77-
printTestCaseName(); defer printTestDuration(time.Now())
81+
printTestCaseName()
82+
defer printTestDuration(time.Now())
7883
testRequires(c, DaemonIsLinux)
7984
//Both the container and image are named busybox. docker inspect will fetch container
8085
//JSON State.Running field. If the field is true, it's a container.
@@ -87,7 +92,8 @@ func (s *DockerSuite) TestInspectTypeFlagContainer(c *check.C) {
8792
}
8893

8994
func (s *DockerSuite) TestInspectTypeFlagWithNoContainer(c *check.C) {
90-
printTestCaseName(); defer printTestDuration(time.Now())
95+
printTestCaseName()
96+
defer printTestDuration(time.Now())
9197
testRequires(c, DaemonIsLinux)
9298
//Run this test on an image named busybox. docker inspect will try to fetch container
9399
//JSON. Since there is no container named busybox and --type=container, docker inspect will
@@ -101,7 +107,8 @@ func (s *DockerSuite) TestInspectTypeFlagWithNoContainer(c *check.C) {
101107
}
102108

103109
func (s *DockerSuite) TestInspectTypeFlagWithImage(c *check.C) {
104-
printTestCaseName(); defer printTestDuration(time.Now())
110+
printTestCaseName()
111+
defer printTestDuration(time.Now())
105112
testRequires(c, DaemonIsLinux)
106113
//Both the container and image are named busybox. docker inspect will fetch image
107114
//JSON as --type=image. if there is no image with name busybox, docker inspect
@@ -114,7 +121,8 @@ func (s *DockerSuite) TestInspectTypeFlagWithImage(c *check.C) {
114121
}
115122

116123
func (s *DockerSuite) TestInspectTypeFlagWithInvalidValue(c *check.C) {
117-
printTestCaseName(); defer printTestDuration(time.Now())
124+
printTestCaseName()
125+
defer printTestDuration(time.Now())
118126
testRequires(c, DaemonIsLinux)
119127
//Both the container and image are named busybox. docker inspect will fail
120128
//as --type=foobar is not a valid value for the flag.
@@ -128,7 +136,8 @@ func (s *DockerSuite) TestInspectTypeFlagWithInvalidValue(c *check.C) {
128136
}
129137

130138
func (s *DockerSuite) TestInspectImageFilterInt(c *check.C) {
131-
printTestCaseName(); defer printTestDuration(time.Now())
139+
printTestCaseName()
140+
defer printTestDuration(time.Now())
132141
testRequires(c, DaemonIsLinux)
133142
imageTest := "busybox"
134143
ensureImageExist(c, imageTest)
@@ -146,7 +155,8 @@ func (s *DockerSuite) TestInspectImageFilterInt(c *check.C) {
146155
}
147156

148157
func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
149-
printTestCaseName(); defer printTestDuration(time.Now())
158+
printTestCaseName()
159+
defer printTestDuration(time.Now())
150160
testRequires(c, DaemonIsLinux)
151161
out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
152162
id := getIDfromOutput(c, out)
@@ -165,7 +175,8 @@ func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
165175
}
166176

167177
func (s *DockerSuite) TestInspectImageGraphDriver(c *check.C) {
168-
printTestCaseName(); defer printTestDuration(time.Now())
178+
printTestCaseName()
179+
defer printTestDuration(time.Now())
169180
testRequires(c, DaemonIsLinux)
170181
imageTest := "busybox"
171182
ensureImageExist(c, imageTest)
@@ -190,7 +201,8 @@ func (s *DockerSuite) TestInspectImageGraphDriver(c *check.C) {
190201

191202
// #14947
192203
func (s *DockerSuite) TestInspectTimesAsRFC3339Nano(c *check.C) {
193-
printTestCaseName(); defer printTestDuration(time.Now())
204+
printTestCaseName()
205+
defer printTestDuration(time.Now())
194206
testRequires(c, DaemonIsLinux)
195207
out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
196208
id := getIDfromOutput(c, out)
@@ -214,7 +226,8 @@ func (s *DockerSuite) TestInspectTimesAsRFC3339Nano(c *check.C) {
214226

215227
// #15633
216228
func (s *DockerSuite) TestInspectLogConfigNoType(c *check.C) {
217-
printTestCaseName(); defer printTestDuration(time.Now())
229+
printTestCaseName()
230+
defer printTestDuration(time.Now())
218231
testRequires(c, DaemonIsLinux)
219232
dockerCmd(c, "create", "--name=test", "busybox")
220233
var logConfig container.LogConfig
@@ -229,7 +242,8 @@ func (s *DockerSuite) TestInspectLogConfigNoType(c *check.C) {
229242
}
230243

231244
func (s *DockerSuite) TestInspectNoSizeFlagContainer(c *check.C) {
232-
printTestCaseName(); defer printTestDuration(time.Now())
245+
printTestCaseName()
246+
defer printTestDuration(time.Now())
233247

234248
//Both the container and image are named busybox. docker inspect will fetch container
235249
//JSON SizeRw and SizeRootFs field. If there is no flag --size/-s, there are no size fields.
@@ -242,7 +256,8 @@ func (s *DockerSuite) TestInspectNoSizeFlagContainer(c *check.C) {
242256
}
243257

244258
func (s *DockerSuite) TestInspectSizeFlagContainer(c *check.C) {
245-
printTestCaseName(); defer printTestDuration(time.Now())
259+
printTestCaseName()
260+
defer printTestDuration(time.Now())
246261
dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
247262

248263
formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
@@ -254,7 +269,8 @@ func (s *DockerSuite) TestInspectSizeFlagContainer(c *check.C) {
254269
}
255270

256271
func (s *DockerSuite) TestInspectSizeFlagImage(c *check.C) {
257-
printTestCaseName(); defer printTestDuration(time.Now())
272+
printTestCaseName()
273+
defer printTestDuration(time.Now())
258274
dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
259275

260276
formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
@@ -267,7 +283,8 @@ func (s *DockerSuite) TestInspectSizeFlagImage(c *check.C) {
267283
}
268284

269285
func (s *DockerSuite) TestInspectTempateError(c *check.C) {
270-
printTestCaseName(); defer printTestDuration(time.Now())
286+
printTestCaseName()
287+
defer printTestDuration(time.Now())
271288
// Template parsing error for both the container and image.
272289

273290
dockerCmd(c, "run", "--name=container1", "-d", "busybox", "top")
@@ -282,7 +299,8 @@ func (s *DockerSuite) TestInspectTempateError(c *check.C) {
282299
}
283300

284301
func (s *DockerSuite) TestInspectJSONFields(c *check.C) {
285-
printTestCaseName(); defer printTestDuration(time.Now())
302+
printTestCaseName()
303+
defer printTestDuration(time.Now())
286304
dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
287305
out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='{{.HostConfig.Dns}}'", "busybox")
288306

@@ -291,7 +309,8 @@ func (s *DockerSuite) TestInspectJSONFields(c *check.C) {
291309
}
292310

293311
func (s *DockerSuite) TestInspectByPrefix(c *check.C) {
294-
printTestCaseName(); defer printTestDuration(time.Now())
312+
printTestCaseName()
313+
defer printTestDuration(time.Now())
295314
imageTest := "busybox"
296315
ensureImageExist(c, imageTest)
297316
id := inspectField(c, imageTest, "Id")
@@ -305,7 +324,8 @@ func (s *DockerSuite) TestInspectByPrefix(c *check.C) {
305324
}
306325

307326
func (s *DockerSuite) TestInspectStopWhenNotFound(c *check.C) {
308-
printTestCaseName(); defer printTestDuration(time.Now())
327+
printTestCaseName()
328+
defer printTestDuration(time.Now())
309329
dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "top")
310330
dockerCmd(c, "run", "--name=not-shown", "-d", "busybox", "top")
311331
out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='{{.Name}}'", "busybox", "missing", "not-shown")

0 commit comments

Comments
 (0)