浏览代码

Merge pull request #9346 from jfrazelle/fix-events-test

fix tests where cmd function does not exist
Michael Crosby 10 年之前
父节点
当前提交
75b47467aa
共有 1 个文件被更改,包括 8 次插入2 次删除
  1. 8 2
      integration-cli/docker_cli_events_test.go

+ 8 - 2
integration-cli/docker_cli_events_test.go

@@ -286,8 +286,14 @@ func TestEventsImageImport(t *testing.T) {
 
 func TestEventsFilters(t *testing.T) {
 	since := time.Now().Unix()
-	cmd(t, "run", "--rm", "busybox", "true")
-	cmd(t, "run", "--rm", "busybox", "true")
+	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "run", "--rm", "busybox", "true"))
+	if err != nil {
+		t.Fatal(out, err)
+	}
+	out, _, err = runCommandWithOutput(exec.Command(dockerBinary, "run", "--rm", "busybox", "true"))
+	if err != nil {
+		t.Fatal(out, err)
+	}
 	eventsCmd := exec.Command(dockerBinary, "events", fmt.Sprintf("--since=%d", since), fmt.Sprintf("--until=%d", time.Now().Unix()), "--filter", "event=die")
 	out, exitCode, err := runCommandWithOutput(eventsCmd)
 	if exitCode != 0 || err != nil {