diff --git a/server/.golangci.yml b/server/.golangci.yml index 979484864a4..a8a1ee5869a 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -101,7 +101,6 @@ issues: channels/app/migrations.go|\ channels/app/permissions.go|\ channels/app/permissions_test.go|\ - channels/app/platform/busy_test.go|\ channels/app/platform/cluster_handlers.go|\ channels/app/platform/config_test.go|\ channels/app/platform/helper_test.go|\ diff --git a/server/channels/app/platform/busy_test.go b/server/channels/app/platform/busy_test.go index 9da384426c5..54c22103dde 100644 --- a/server/channels/app/platform/busy_test.go +++ b/server/channels/app/platform/busy_test.go @@ -16,7 +16,7 @@ import ( ) func TestBusySet(t *testing.T) { - cluster := &ClusterMock{Busy: &Busy{}} + cluster := &ClusterMock{Busy: &Busy{}, t: t} busy := NewBusy(cluster) isNotBusy := func() bool { @@ -54,7 +54,7 @@ func TestBusySet(t *testing.T) { } func TestBusyExpires(t *testing.T) { - cluster := &ClusterMock{Busy: &Busy{}} + cluster := &ClusterMock{Busy: &Busy{}, t: t} busy := NewBusy(cluster) isNotBusy := func() bool { @@ -90,7 +90,7 @@ func TestBusyExpires(t *testing.T) { } func TestBusyRace(t *testing.T) { - cluster := &ClusterMock{Busy: &Busy{}} + cluster := &ClusterMock{Busy: &Busy{}, t: t} busy := NewBusy(cluster) busy.Set(500 * time.Millisecond) @@ -119,11 +119,15 @@ func compareBusyState(t *testing.T, busy1 *Busy, busy2 *Busy) bool { // ClusterMock simulates the busy state of a cluster. type ClusterMock struct { Busy *Busy + t *testing.T } func (c *ClusterMock) SendClusterMessage(msg *model.ClusterMessage) { var sbs model.ServerBusyState - json.Unmarshal(msg.Data, &sbs) + err := json.Unmarshal(msg.Data, &sbs) + if err != nil { + require.NoError(c.t, err) + } c.Busy.ClusterEventChanged(&sbs) }