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

fix tests 

Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
Victor Vieux 2014-11-25 17:07:04 +00:00
parent 284cbda9ce
commit f0f0e316aa
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration-cli/docker_cli_events_test.go
View File

@ -285,10 +285,10 @@ func TestEventsImageImport(t *testing.T) {
} }
func TestEventsFilters(t *testing.T) { func TestEventsFilters(t *testing.T) {
now := time.Now().Unix() since := time.Now().Unix()
cmd(t, "run", "--rm", "busybox", "true") cmd(t, "run", "--rm", "busybox", "true")
cmd(t, "run", "--rm", "busybox", "true") cmd(t, "run", "--rm", "busybox", "true")
eventsCmd := exec.Command(dockerBinary, "events", fmt.Sprintf("--since=%d", now), fmt.Sprintf("--until=%d", time.Now().Unix()), "--filter", "event=die") 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) out, exitCode, err := runCommandWithOutput(eventsCmd)
if exitCode != 0 || err != nil { if exitCode != 0 || err != nil {
t.Fatalf("Failed to get events with exit code %d: %s", exitCode, err) t.Fatalf("Failed to get events with exit code %d: %s", exitCode, err)
@ -296,8 +296,7 @@ func TestEventsFilters(t *testing.T) {
events := strings.Split(out, "\n") events := strings.Split(out, "\n")
events = events[:len(events)-1] events = events[:len(events)-1]
if len(events) != 2 { if len(events) != 2 {
fmt.Printf("%v\n", events) t.Fatalf("Expected 2 events, got %d: %v", len(events), events)
t.Fatalf("Unexpected event")
} }
dieEvent := strings.Fields(events[len(events)-1]) dieEvent := strings.Fields(events[len(events)-1])
if dieEvent[len(dieEvent)-1] != "die" { if dieEvent[len(dieEvent)-1] != "die" {
@ -309,7 +308,7 @@ func TestEventsFilters(t *testing.T) {
t.Fatalf("event should be die, not %#v", dieEvent) t.Fatalf("event should be die, not %#v", dieEvent)
} }
eventsCmd = exec.Command(dockerBinary, "events", "--since=0", fmt.Sprintf("--until=%d", time.Now().Unix()), "--filter", "event=die", "--filter", "event=start") eventsCmd = exec.Command(dockerBinary, "events", fmt.Sprintf("--since=%d", since), fmt.Sprintf("--until=%d", time.Now().Unix()), "--filter", "event=die", "--filter", "event=start")
out, exitCode, err = runCommandWithOutput(eventsCmd) out, exitCode, err = runCommandWithOutput(eventsCmd)
if exitCode != 0 || err != nil { if exitCode != 0 || err != nil {
t.Fatalf("Failed to get events with exit code %d: %s", exitCode, err) t.Fatalf("Failed to get events with exit code %d: %s", exitCode, err)
@ -317,7 +316,7 @@ func TestEventsFilters(t *testing.T) {
events = strings.Split(out, "\n") events = strings.Split(out, "\n")
events = events[:len(events)-1] events = events[:len(events)-1]
if len(events) != 4 { if len(events) != 4 {
t.Fatalf("Unexpected event") t.Fatalf("Expected 4 events, got %d: %v", len(events), events)
} }
startEvent := strings.Fields(events[len(events)-4]) startEvent := strings.Fields(events[len(events)-4])
if startEvent[len(startEvent)-1] != "start" { if startEvent[len(startEvent)-1] != "start" {