p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12754 from LK4D4/carry_12707

Browse Source 
fix runtime issue for TestEventsFilterContainer
Upstream-commit: 03719be8302d904893b97c03a3bf94f50a376876
Component: engine
This commit is contained in:
Brian Goff
2015-04-24 14:36:58 -04:00
parent 309992418e 3acd724e10
commit f6e14ef42d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/engine/integration-cli/docker_cli_events_test.go
View File

@ -340,12 +340,15 @@ func (s *DockerSuite) TestEventsFilterContainer(c *check.C) {
nameID := make(map[string]string)
for _, name := range []string{"container_1", "container_2"} {
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "-d", "--name", name, "busybox", "true"))
out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "--name", name, "busybox", "true"))
if err != nil {
c.Fatalf("Error: %v, Output: %s", err, out)
}
id, err := inspectField(name, "Id")
if err != nil {
c.Fatal(err)
}
nameID[name] = strings.TrimSpace(out)
waitInspect(name, "{{.State.Runing }}", "false", 5)
nameID[name] = id
}
until := fmt.Sprintf("%d", daemonTime(c).Unix())