Skip to content

Commit 9af5d7c

Browse files
vdemeestervdemeester
committed
Small cleanups on integration cli
- Join a few tests in one when it makes sense (reduce the number of container run and thus the overall time of the suites) - Remove some duplication on several tests - Remove some unused methods Signed-off-by: Vincent Demeester <vincent@sbr.pm>
1 parent bf71db7 commit 9af5d7c

10 files changed

+60
-310
lines changed

integration-cli/daemon_swarm_hack.go renamed to integration-cli/daemon_swarm_hack_test.go

File renamed without changes.

‎integration-cli/docker_api_containers_test.go‎

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -564,32 +564,11 @@ func (s *DockerSuite) TestContainerAPICreateMultipleNetworksConfig(c *check.C) {
564564
}
565565

566566
func (s *DockerSuite) TestContainerAPICreateWithHostName(c *check.C) {
567-
hostName := "test-host"
568-
config := map[string]interface{}{
569-
"Image": "busybox",
570-
"Hostname": hostName,
571-
}
572-
573-
status, body, err := request.SockRequest("POST", "/containers/create", config, daemonHost())
574-
c.Assert(err, checker.IsNil)
575-
c.Assert(status, checker.Equals, http.StatusCreated)
576-
577-
var container containertypes.ContainerCreateCreatedBody
578-
c.Assert(json.Unmarshal(body, &container), checker.IsNil)
579-
580-
status, body, err = request.SockRequest("GET", "/containers/"+container.ID+"/json", nil, daemonHost())
581-
c.Assert(err, checker.IsNil)
582-
c.Assert(status, checker.Equals, http.StatusOK)
583-
584-
var containerJSON types.ContainerJSON
585-
c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
586-
c.Assert(containerJSON.Config.Hostname, checker.Equals, hostName, check.Commentf("Mismatched Hostname"))
587-
}
588-
589-
func (s *DockerSuite) TestContainerAPICreateWithDomainName(c *check.C) {
590567
domainName := "test-domain"
568+
hostName := "test-hostname"
591569
config := map[string]interface{}{
592570
"Image": "busybox",
571+
"Hostname": hostName,
593572
"Domainname": domainName,
594573
}
595574

@@ -606,6 +585,7 @@ func (s *DockerSuite) TestContainerAPICreateWithDomainName(c *check.C) {
606585

607586
var containerJSON types.ContainerJSON
608587
c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
588+
c.Assert(containerJSON.Config.Hostname, checker.Equals, hostName, check.Commentf("Mismatched Hostname"))
609589
c.Assert(containerJSON.Config.Domainname, checker.Equals, domainName, check.Commentf("Mismatched Domainname"))
610590
}
611591

‎integration-cli/docker_cli_daemon_test.go‎

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2347,35 +2347,17 @@ func (s *DockerDaemonSuite) TestBuildOnDisabledBridgeNetworkDaemon(c *check.C) {
23472347
}
23482348

23492349
// Test case for #21976
2350-
func (s *DockerDaemonSuite) TestDaemonDNSInHostMode(c *check.C) {
2350+
func (s *DockerDaemonSuite) TestDaemonDNSFlagsInHostMode(c *check.C) {
23512351
testRequires(c, SameHostDaemon, DaemonIsLinux)
23522352

2353-
s.d.StartWithBusybox(c, "--dns", "1.2.3.4")
2353+
s.d.StartWithBusybox(c, "--dns", "1.2.3.4", "--dns-search", "example.com", "--dns-opt", "timeout:3")
23542354

23552355
expectedOutput := "nameserver 1.2.3.4"
23562356
out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
23572357
c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
2358-
}
2359-
2360-
// Test case for #21976
2361-
func (s *DockerDaemonSuite) TestDaemonDNSSearchInHostMode(c *check.C) {
2362-
testRequires(c, SameHostDaemon, DaemonIsLinux)
2363-
2364-
s.d.StartWithBusybox(c, "--dns-search", "example.com")
2365-
2366-
expectedOutput := "search example.com"
2367-
out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
2358+
expectedOutput = "search example.com"
23682359
c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
2369-
}
2370-
2371-
// Test case for #21976
2372-
func (s *DockerDaemonSuite) TestDaemonDNSOptionsInHostMode(c *check.C) {
2373-
testRequires(c, SameHostDaemon, DaemonIsLinux)
2374-
2375-
s.d.StartWithBusybox(c, "--dns-opt", "timeout:3")
2376-
2377-
expectedOutput := "options timeout:3"
2378-
out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
2360+
expectedOutput = "options timeout:3"
23792361
c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
23802362
}
23812363

‎integration-cli/docker_cli_experimental_test.go‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,26 +8,19 @@ import (
88
)
99

1010
func (s *DockerSuite) TestExperimentalVersionTrue(c *check.C) {
11-
testRequires(c, ExperimentalDaemon)
12-
13-
out, _ := dockerCmd(c, "version")
14-
for _, line := range strings.Split(out, "\n") {
15-
if strings.HasPrefix(strings.TrimSpace(line), "Experimental:") {
16-
c.Assert(line, checker.Matches, "*true")
17-
return
18-
}
19-
}
20-
21-
c.Fatal(`"Experimental" not found in version output`)
11+
testExperimentalInVersion(c, ExperimentalDaemon, "*true")
2212
}
2313

2414
func (s *DockerSuite) TestExperimentalVersionFalse(c *check.C) {
25-
testRequires(c, NotExperimentalDaemon)
15+
testExperimentalInVersion(c, NotExperimentalDaemon, "*false")
16+
}
2617

18+
func testExperimentalInVersion(c *check.C, requirement func() bool, expectedValue string) {
19+
testRequires(c, requirement)
2720
out, _ := dockerCmd(c, "version")
2821
for _, line := range strings.Split(out, "\n") {
2922
if strings.HasPrefix(strings.TrimSpace(line), "Experimental:") {
30-
c.Assert(line, checker.Matches, "*false")
23+
c.Assert(line, checker.Matches, expectedValue)
3124
return
3225
}
3326
}

‎integration-cli/docker_cli_health_test.go‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,6 @@ import (
1212
"github.com/go-check/check"
1313
)
1414

15-
func waitForStatus(c *check.C, name string, prev string, expected string) {
16-
prev = prev + "\n"
17-
expected = expected + "\n"
18-
for {
19-
out, _ := dockerCmd(c, "inspect", "--format={{.State.Status}}", name)
20-
if out == expected {
21-
return
22-
}
23-
c.Check(out, checker.Equals, prev)
24-
if out != prev {
25-
return
26-
}
27-
time.Sleep(100 * time.Millisecond)
28-
}
29-
}
30-
3115
func waitForHealthStatus(c *check.C, name string, prev string, expected string) {
3216
prev = prev + "\n"
3317
expected = expected + "\n"

‎integration-cli/docker_cli_logs_test.go‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,24 @@ import (
1717

1818
// This used to work, it test a log of PageSize-1 (gh#4851)
1919
func (s *DockerSuite) TestLogsContainerSmallerThanPage(c *check.C) {
20-
testLen := 32767
21-
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
22-
23-
id := strings.TrimSpace(out)
24-
dockerCmd(c, "wait", id)
25-
26-
out, _ = dockerCmd(c, "logs", id)
27-
28-
c.Assert(out, checker.HasLen, testLen+1)
20+
testLogsContainerPagination(c, 32767)
2921
}
3022

3123
// Regression test: When going over the PageSize, it used to panic (gh#4851)
3224
func (s *DockerSuite) TestLogsContainerBiggerThanPage(c *check.C) {
33-
testLen := 32768
34-
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
35-
36-
id := strings.TrimSpace(out)
37-
dockerCmd(c, "wait", id)
38-
39-
out, _ = dockerCmd(c, "logs", id)
40-
41-
c.Assert(out, checker.HasLen, testLen+1)
25+
testLogsContainerPagination(c, 32768)
4226
}
4327

4428
// Regression test: When going much over the PageSize, it used to block (gh#4851)
4529
func (s *DockerSuite) TestLogsContainerMuchBiggerThanPage(c *check.C) {
46-
testLen := 33000
47-
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
30+
testLogsContainerPagination(c, 33000)
31+
}
4832

33+
func testLogsContainerPagination(c *check.C, testLen int) {
34+
out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
4935
id := strings.TrimSpace(out)
5036
dockerCmd(c, "wait", id)
51-
5237
out, _ = dockerCmd(c, "logs", id)
53-
5438
c.Assert(out, checker.HasLen, testLen+1)
5539
}
5640

‎integration-cli/docker_cli_run_test.go‎

Lines changed: 21 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,13 +1854,20 @@ func (s *DockerSuite) TestRunInteractiveWithRestartPolicy(c *check.C) {
18541854
}
18551855

18561856
// Test for #2267
1857-
func (s *DockerSuite) TestRunWriteHostsFileAndNotCommit(c *check.C) {
1858-
// Cannot run on Windows as Windows does not support diff.
1857+
func (s *DockerSuite) TestRunWriteSpecialFilesAndNotCommit(c *check.C) {
1858+
// Cannot run on Windows as this files are not present in Windows
18591859
testRequires(c, DaemonIsLinux)
1860-
name := "writehosts"
1861-
out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/hosts && cat /etc/hosts")
1860+
1861+
testRunWriteSpecialFilesAndNotCommit(c, "writehosts", "/etc/hosts")
1862+
testRunWriteSpecialFilesAndNotCommit(c, "writehostname", "/etc/hostname")
1863+
testRunWriteSpecialFilesAndNotCommit(c, "writeresolv", "/etc/resolv.conf")
1864+
}
1865+
1866+
func testRunWriteSpecialFilesAndNotCommit(c *check.C, name, path string) {
1867+
command := fmt.Sprintf("echo test2267 >> %s && cat %s", path, path)
1868+
out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", command)
18621869
if !strings.Contains(out, "test2267") {
1863-
c.Fatal("/etc/hosts should contain 'test2267'")
1870+
c.Fatalf("%s should contain 'test2267'", path)
18641871
}
18651872

18661873
out, _ = dockerCmd(c, "diff", name)
@@ -1897,38 +1904,6 @@ func sliceEq(a, b []string) bool {
18971904
return true
18981905
}
18991906

1900-
// Test for #2267
1901-
func (s *DockerSuite) TestRunWriteHostnameFileAndNotCommit(c *check.C) {
1902-
// Cannot run on Windows as Windows does not support diff.
1903-
testRequires(c, DaemonIsLinux)
1904-
name := "writehostname"
1905-
out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/hostname && cat /etc/hostname")
1906-
if !strings.Contains(out, "test2267") {
1907-
c.Fatal("/etc/hostname should contain 'test2267'")
1908-
}
1909-
1910-
out, _ = dockerCmd(c, "diff", name)
1911-
if len(strings.Trim(out, "\r\n")) != 0 && !eqToBaseDiff(out, c) {
1912-
c.Fatal("diff should be empty")
1913-
}
1914-
}
1915-
1916-
// Test for #2267
1917-
func (s *DockerSuite) TestRunWriteResolvFileAndNotCommit(c *check.C) {
1918-
// Cannot run on Windows as Windows does not support diff.
1919-
testRequires(c, DaemonIsLinux)
1920-
name := "writeresolv"
1921-
out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/resolv.conf && cat /etc/resolv.conf")
1922-
if !strings.Contains(out, "test2267") {
1923-
c.Fatal("/etc/resolv.conf should contain 'test2267'")
1924-
}
1925-
1926-
out, _ = dockerCmd(c, "diff", name)
1927-
if len(strings.Trim(out, "\r\n")) != 0 && !eqToBaseDiff(out, c) {
1928-
c.Fatal("diff should be empty")
1929-
}
1930-
}
1931-
19321907
func (s *DockerSuite) TestRunWithBadDevice(c *check.C) {
19331908
// Cannot run on Windows as Windows does not support --device
19341909
testRequires(c, DaemonIsLinux)
@@ -3453,38 +3428,14 @@ func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {
34533428
// Not applicable on Windows as uses Unix specific functionality
34543429
testRequires(c, DaemonIsLinux)
34553430

3456-
cgroupParent := "test"
3457-
name := "cgroup-test"
3431+
// cgroup-parent relative path
3432+
testRunContainerWithCgroupParent(c, "test", "cgroup-test")
34583433

3459-
out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
3460-
if err != nil {
3461-
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
3462-
}
3463-
cgroupPaths := testutil.ParseCgroupPaths(string(out))
3464-
if len(cgroupPaths) == 0 {
3465-
c.Fatalf("unexpected output - %q", string(out))
3466-
}
3467-
id, err := getIDByName(name)
3468-
c.Assert(err, check.IsNil)
3469-
expectedCgroup := path.Join(cgroupParent, id)
3470-
found := false
3471-
for _, path := range cgroupPaths {
3472-
if strings.HasSuffix(path, expectedCgroup) {
3473-
found = true
3474-
break
3475-
}
3476-
}
3477-
if !found {
3478-
c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
3479-
}
3434+
// cgroup-parent absolute path
3435+
testRunContainerWithCgroupParent(c, "/cgroup-parent/test", "cgroup-test-absolute")
34803436
}
34813437

3482-
func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {
3483-
// Not applicable on Windows as uses Unix specific functionality
3484-
testRequires(c, DaemonIsLinux)
3485-
3486-
cgroupParent := "/cgroup-parent/test"
3487-
name := "cgroup-test"
3438+
func testRunContainerWithCgroupParent(c *check.C, cgroupParent, name string) {
34883439
out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
34893440
if err != nil {
34903441
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
@@ -3513,49 +3464,12 @@ func (s *DockerSuite) TestRunInvalidCgroupParent(c *check.C) {
35133464
// Not applicable on Windows as uses Unix specific functionality
35143465
testRequires(c, DaemonIsLinux)
35153466

3516-
cgroupParent := "../../../../../../../../SHOULD_NOT_EXIST"
3517-
cleanCgroupParent := "SHOULD_NOT_EXIST"
3518-
name := "cgroup-invalid-test"
3467+
testRunInvalidCgroupParent(c, "../../../../../../../../SHOULD_NOT_EXIST", "SHOULD_NOT_EXIST", "cgroup-invalid-test")
35193468

3520-
out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
3521-
if err != nil {
3522-
// XXX: This may include a daemon crash.
3523-
c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
3524-
}
3525-
3526-
// We expect "/SHOULD_NOT_EXIST" to not exist. If not, we have a security issue.
3527-
if _, err := os.Stat("/SHOULD_NOT_EXIST"); err == nil || !os.IsNotExist(err) {
3528-
c.Fatalf("SECURITY: --cgroup-parent with ../../ relative paths cause files to be created in the host (this is bad) !!")
3529-
}
3530-
3531-
cgroupPaths := testutil.ParseCgroupPaths(string(out))
3532-
if len(cgroupPaths) == 0 {
3533-
c.Fatalf("unexpected output - %q", string(out))
3534-
}
3535-
id, err := getIDByName(name)
3536-
c.Assert(err, check.IsNil)
3537-
expectedCgroup := path.Join(cleanCgroupParent, id)
3538-
found := false
3539-
for _, path := range cgroupPaths {
3540-
if strings.HasSuffix(path, expectedCgroup) {
3541-
found = true
3542-
break
3543-
}
3544-
}
3545-
if !found {
3546-
c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
3547-
}
3469+
testRunInvalidCgroupParent(c, "/../../../../../../../../SHOULD_NOT_EXIST", "/SHOULD_NOT_EXIST", "cgroup-absolute-invalid-test")
35483470
}
35493471

3550-
// TestRunInvalidCgroupParent checks that a specially-crafted cgroup parent doesn't cause Docker to crash or start modifying /.
3551-
func (s *DockerSuite) TestRunAbsoluteInvalidCgroupParent(c *check.C) {
3552-
// Not applicable on Windows as uses Unix specific functionality
3553-
testRequires(c, DaemonIsLinux)
3554-
3555-
cgroupParent := "/../../../../../../../../SHOULD_NOT_EXIST"
3556-
cleanCgroupParent := "/SHOULD_NOT_EXIST"
3557-
name := "cgroup-absolute-invalid-test"
3558-
3472+
func testRunInvalidCgroupParent(c *check.C, cgroupParent, cleanCgroupParent, name string) {
35593473
out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
35603474
if err != nil {
35613475
// XXX: This may include a daemon crash.
@@ -3564,7 +3478,7 @@ func (s *DockerSuite) TestRunAbsoluteInvalidCgroupParent(c *check.C) {
35643478

35653479
// We expect "/SHOULD_NOT_EXIST" to not exist. If not, we have a security issue.
35663480
if _, err := os.Stat("/SHOULD_NOT_EXIST"); err == nil || !os.IsNotExist(err) {
3567-
c.Fatalf("SECURITY: --cgroup-parent with /../../ garbage paths cause files to be created in the host (this is bad) !!")
3481+
c.Fatalf("SECURITY: --cgroup-parent with ../../ relative paths cause files to be created in the host (this is bad) !!")
35683482
}
35693483

35703484
cgroupPaths := testutil.ParseCgroupPaths(string(out))

0 commit comments

Comments
 (0)