0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon/events: verify non-deprecated fields

Browse source 
Some tests were testing the deprecated fields, instead of their non-deprecated
alternatives.

This patch adds a utility to verify that they match, and rewrites the tests
to check the non-deprecated fields instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2023-08-26 14:03:14 +02:00
parent f443006fa2
commit 62ec14d9ec
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
daemon/events/events_test.go
View file

@ -12,6 +12,19 @@ import (
is "gotest.tools/v3/assert/cmp"
)
// validateLegacyFields validates that the legacy "Status", "ID", and "From"
// fields are set to the same value as their "current" (non-legacy) fields.
//
// These fields were deprecated since v1.10 (https://github.com/moby/moby/pull/18888).
//
// TODO remove this once we removed the deprecated `ID`, `Status`, and `From` fields.
func validateLegacyFields(t *testing.T, msg events.Message) {
t.Helper()
assert.Check(t, is.Equal(msg.Status, msg.Action), "Legacy Status field does not match Action")
assert.Check(t, is.Equal(msg.ID, msg.Actor.ID), "Legacy ID field does not match Actor.ID")
assert.Check(t, is.Equal(msg.From, msg.Actor.Attributes["image"]), "Legacy From field does not match Actor.Attributes.image")
}
func TestEventsLog(t *testing.T) {
e := New()
_, l1, _ := e.Subscribe()
@ -31,9 +44,10 @@ func TestEventsLog(t *testing.T) {
jmsg, ok := msg.(events.Message)
assert.Assert(t, ok, "unexpected type: %T", msg)
assert.Check(t, is.Equal(jmsg.Status, "test"))
assert.Check(t, is.Equal(jmsg.ID, "cont"))
assert.Check(t, is.Equal(jmsg.From, "image"))
validateLegacyFields(t, jmsg)
assert.Check(t, is.Equal(jmsg.Action, "test"))
assert.Check(t, is.Equal(jmsg.Actor.ID, "cont"))
assert.Check(t, is.Equal(jmsg.Actor.Attributes["image"], "image"))
case <-time.After(1 * time.Second):
t.Fatal("Timeout waiting for broadcasted message")
}
@ -43,9 +57,10 @@ func TestEventsLog(t *testing.T) {
jmsg, ok := msg.(events.Message)
assert.Assert(t, ok, "unexpected type: %T", msg)
assert.Check(t, is.Equal(jmsg.Status, "test"))
assert.Check(t, is.Equal(jmsg.ID, "cont"))
assert.Check(t, is.Equal(jmsg.From, "image"))
validateLegacyFields(t, jmsg)
assert.Check(t, is.Equal(jmsg.Action, "test"))
assert.Check(t, is.Equal(jmsg.Actor.ID, "cont"))
assert.Check(t, is.Equal(jmsg.Actor.Attributes["image"], "image"))
case <-time.After(1 * time.Second):
t.Fatal("Timeout waiting for broadcasted message")
}
@ -105,9 +120,8 @@ func TestLogEvents(t *testing.T) {
assert.Assert(t, is.Len(current, eventsLimit))
first := current[0]
validateLegacyFields(t, first)
assert.Check(t, is.Equal(first.Action, "action_16"))
// TODO remove this once we removed the deprecated `ID`, `Status`, and `From` fields
assert.Check(t, is.Equal(first.Action, first.Status), "Action does not match Status")
last := current[len(current)-1]
assert.Check(t, is.Equal(last.Action, "action_271"))