Created
November 19, 2014 21:45
-
-
Save tonistiigi/ca99deea7b679c398cc7 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/integration-cli/docker_cli_events_test.go b/integration-cli/docker_cli_events_test.go | |
index eee9224..92ff241 100644 | |
--- a/integration-cli/docker_cli_events_test.go | |
+++ b/integration-cli/docker_cli_events_test.go | |
@@ -64,7 +64,7 @@ func TestEventsPause(t *testing.T) { | |
t.Fatalf("event should be pause, not %#v", unpauseEvent) | |
} | |
- waitCmd := exec.Command(dockerBinary, "wait", "testeventpause") | |
+ waitCmd := exec.Command(dockerBinary, "wait", name) | |
if waitOut, _, err := runCommandWithOutput(waitCmd); err != nil { | |
t.Fatalf("error thrown while waiting for container: %s, %v", waitOut, err) | |
} | |
diff --git a/integration-cli/docker_cli_run_test.go b/integration-cli/docker_cli_run_test.go | |
index 7c6a198..ca44aa3 100644 | |
--- a/integration-cli/docker_cli_run_test.go | |
+++ b/integration-cli/docker_cli_run_test.go | |
@@ -574,13 +574,13 @@ func TestRunVolumesFromSymlinkPath(t *testing.T) { | |
t.Fatalf("could not build 'docker-test-volumesfromsymlinkpath': %v", err) | |
} | |
- cmd := exec.Command(dockerBinary, "run", "--name", name, name) | |
+ cmd := exec.Command(dockerBinary, "run", "--name", "test-volumesfromsymlinkpath", name) | |
exitCode, err := runCommand(cmd) | |
if err != nil || exitCode != 0 { | |
t.Fatalf("[run] (volume) err: %v, exitcode: %d", err, exitCode) | |
} | |
- cmd = exec.Command(dockerBinary, "run", "--volumes-from", name, "busybox", "sh", "-c", "ls /foo | grep -q bar") | |
+ cmd = exec.Command(dockerBinary, "run", "--volumes-from", "test-volumesfromsymlinkpath", "busybox", "sh", "-c", "ls /foo | grep -q bar") | |
exitCode, err = runCommand(cmd) | |
if err != nil || exitCode != 0 { | |
t.Fatalf("[run] err: %v, exitcode: %d", err, exitCode) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment