docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9847 from LK4D4/fix_net_host_test 

Fix net host test
This commit is contained in:
Jessie Frazelle 2014-12-29 13:28:15 -08:00
parent 9404e95c08 e98c08a88f
commit b4d09da715
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
integration-cli/docker_cli_run_test.go
View File

@ -2520,11 +2520,11 @@ func TestRunModeIpcHost(t *testing.T) {
out2 = strings.Trim(out2, "\n") out2 = strings.Trim(out2, "\n")
if hostIpc == out2 { if hostIpc == out2 {
t.Fatalf("IPC should be different without --ipc=host %s != %s\n", hostIpc, out2) t.Fatalf("IPC should be different without --ipc=host %s == %s\n", hostIpc, out2)
} }
deleteAllContainers() deleteAllContainers()
logDone("run - hostname and several network modes") logDone("run - ipc host mode")
} }
func TestRunModeIpcContainer(t *testing.T) { func TestRunModeIpcContainer(t *testing.T) {
@ -2562,7 +2562,7 @@ func TestRunModeIpcContainer(t *testing.T) {
} }
deleteAllContainers() deleteAllContainers()
logDone("run - hostname and several network modes") logDone("run - ipc container mode")
} }
func TestContainerNetworkMode(t *testing.T) { func TestContainerNetworkMode(t *testing.T) {
@ -2708,18 +2708,32 @@ func TestRunNonLocalMacAddress(t *testing.T) {
func TestRunNetHost(t *testing.T) { func TestRunNetHost(t *testing.T) {
defer deleteAllContainers() defer deleteAllContainers()
iplinkHost, err := exec.Command("ip", "link", "list").CombinedOutput() hostNet, err := os.Readlink("/proc/1/ns/net")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
iplinkCont, err := exec.Command(dockerBinary, "run", "--net=host", "busybox", "ip", "link", "list").CombinedOutput() cmd := exec.Command(dockerBinary, "run", "--net=host", "busybox", "readlink", "/proc/self/ns/net")
out2, _, err := runCommandWithOutput(cmd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err, out2)
} }
if !bytes.Equal(iplinkHost, iplinkCont) { out2 = strings.Trim(out2, "\n")
t.Fatalf("Container network:\n%s\nis not equal to host network:\n%s", iplinkCont, iplinkHost) if hostNet != out2 {
t.Fatalf("Net namespace different with --net=host %s != %s\n", hostNet, out2)
} }
logDone("run - host network")
cmd = exec.Command(dockerBinary, "run", "busybox", "readlink", "/proc/self/ns/net")
out2, _, err = runCommandWithOutput(cmd)
if err != nil {
t.Fatal(err, out2)
}
out2 = strings.Trim(out2, "\n")
if hostNet == out2 {
t.Fatalf("Net namespace should be different without --net=host %s == %s\n", hostNet, out2)
}
logDone("run - net host mode")
} }