Merge pull request #7298 from erikh/fix_cli_restart_test

fix docker integration-cli restart test race
This commit is contained in:
unclejack 2014-07-30 23:29:39 +03:00
commit 3100afa0e1
1 changed files with 5 additions and 0 deletions

View File

@ -4,6 +4,7 @@ import (
"os/exec"
"strings"
"testing"
"time"
)
func TestDockerRestartStoppedContainer(t *testing.T) {
@ -49,6 +50,8 @@ func TestDockerRestartRunningContainer(t *testing.T) {
cleanedContainerID := stripTrailingCharacters(out)
time.Sleep(1 * time.Second)
runCmd = exec.Command(dockerBinary, "logs", cleanedContainerID)
out, _, err = runCommandWithOutput(runCmd)
errorOut(err, t, out)
@ -65,6 +68,8 @@ func TestDockerRestartRunningContainer(t *testing.T) {
out, _, err = runCommandWithOutput(runCmd)
errorOut(err, t, out)
time.Sleep(1 * time.Second)
if out != "foobar\nfoobar\n" {
t.Errorf("container should've printed 'foobar' twice")
}