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

integration-cli: remove bash dependency from TestRunSetMacAddress 

This change enables TestRunSetMacAddress to run on windows
without `bash` dependency. Also `defer`red call of cleanup
method.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
This commit is contained in:
Ahmet Alp Balkan 2015-02-17 22:18:28 -08:00
parent 2243e32cbb
commit c1a54048e2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
integration-cli/docker_cli_run_test.go
View File

@ -2303,17 +2303,18 @@ func TestRunNetworkNotInitializedNoneMode(t *testing.T) {
func TestRunSetMacAddress(t *testing.T) { func TestRunSetMacAddress(t *testing.T) {
mac := "12:34:56:78:9a:bc" mac := "12:34:56:78:9a:bc"
cmd := exec.Command("/bin/bash", "-c", dockerBinary+` run -i --rm --mac-address=`+mac+` busybox /bin/sh -c "ip link show eth0 | tail -1 | awk '{ print \$2 }'"`)
out, _, err := runCommandWithOutput(cmd) defer deleteAllContainers()
cmd := exec.Command(dockerBinary, "run", "-i", "--rm", fmt.Sprintf("--mac-address=%s", mac), "busybox", "/bin/sh", "-c", "ip link show eth0 | tail -1 | awk '{print $2}'")
out, ec, err := runCommandWithOutput(cmd)
if err != nil { if err != nil {
t.Fatal(err) t.Fatalf("exec failed:\nexit code=%v\noutput=%s", ec, out)
} }
actualMac := strings.TrimSpace(out) actualMac := strings.TrimSpace(out)
if actualMac != mac { if actualMac != mac {
t.Fatalf("Set MAC address with --mac-address failed. The container has an incorrect MAC address: %q, expected: %q", actualMac, mac) t.Fatalf("Set MAC address with --mac-address failed. The container has an incorrect MAC address: %q, expected: %q", actualMac, mac)
} }
deleteAllContainers()
logDone("run - setting MAC address with --mac-address") logDone("run - setting MAC address with --mac-address")
} }