Skip to content

Commit

Permalink
Update TestLogEvents to not use deprecated Status field
Browse files Browse the repository at this point in the history
The `Status` field was deprecated in favor of `Action`.

This patch updates the test to use the `Action` field,
but adds a check that both are set to the same value.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Dec 20, 2017
1 parent fb39350 commit b7d204e
Showing 1 changed file with 15 additions and 8 deletions.
23 changes: 15 additions & 8 deletions daemon/events/events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,28 @@ func TestLogEvents(t *testing.T) {
t.Fatalf("Must be %d events, got %d", eventsLimit, len(current))
}
first := current[0]
if first.Status != "action_16" {
t.Fatalf("First action is %s, must be action_16", first.Status)

// TODO remove this once we removed the deprecated `ID`, `Status`, and `From` fields
if first.Action != first.Status {
// Verify that the (deprecated) Status is set to the expected value
t.Fatalf("Action (%s) does not match Status (%s)", first.Action, first.Status)
}

if first.Action != "action_16" {
t.Fatalf("First action is %s, must be action_16", first.Action)
}
last := current[len(current)-1]
if last.Status != "action_271" {
t.Fatalf("Last action is %s, must be action_271", last.Status)
if last.Action != "action_271" {
t.Fatalf("Last action is %s, must be action_271", last.Action)
}

firstC := msgs[0]
if firstC.Status != "action_272" {
t.Fatalf("First action is %s, must be action_272", firstC.Status)
if firstC.Action != "action_272" {
t.Fatalf("First action is %s, must be action_272", firstC.Action)
}
lastC := msgs[len(msgs)-1]
if lastC.Status != "action_281" {
t.Fatalf("Last action is %s, must be action_281", lastC.Status)
if lastC.Action != "action_281" {
t.Fatalf("Last action is %s, must be action_281", lastC.Action)
}
}

Expand Down

0 comments on commit b7d204e

Please sign in to comment.