From aa7466b8191ca87dfd1e583c4cbf6001e96ca28e Mon Sep 17 00:00:00 2001 From: Roberto Dip Date: Mon, 6 Mar 2023 12:24:40 -0300 Subject: [PATCH] fix test race in schedule mock (#10309) This fixes the races that are occurring on tests ([example](https://github.com/fleetdm/fleet/actions/runs/4339799935)) --- server/service/schedule/schedule_test.go | 2 +- server/service/schedule/testing_utils.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/server/service/schedule/schedule_test.go b/server/service/schedule/schedule_test.go index f620265a35..ccbe80d1c0 100644 --- a/server/service/schedule/schedule_test.go +++ b/server/service/schedule/schedule_test.go @@ -506,7 +506,7 @@ func TestTriggerReleaseLock(t *testing.T) { require.Equal(t, seedStats, statsByType[fleet.CronStatsTypeScheduled]) } - require.True(t, locker.expiresAt.Before(time.Now())) + require.True(t, locker.GetExpiration().Before(time.Now())) } func TestMultipleScheduleInstancesConfigChangesDS(t *testing.T) { diff --git a/server/service/schedule/testing_utils.go b/server/service/schedule/testing_utils.go index 059408555d..a15d0d7b62 100644 --- a/server/service/schedule/testing_utils.go +++ b/server/service/schedule/testing_utils.go @@ -99,6 +99,13 @@ func (ml *MockLock) GetLockCount() int { return ml.LockCount } +func (ml *MockLock) GetExpiration() time.Time { + ml.mu.Lock() + defer ml.mu.Unlock() + + return ml.expiresAt +} + func (ml *MockLock) AddChannels(t *testing.T, chanNames ...string) error { ml.mu.Lock() defer ml.mu.Unlock()