Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 09:28:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 60

Adjust flaky tests (#8811)

Browse source
This commit is contained in:
gillespi314 2022-11-25 12:09:55 -06:00 committed by GitHub
parent 057b06ad6f
commit 4a73d4a887
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/datastore/mysql/cron_stats_test.go
View file

@ -79,7 +79,7 @@ func TestGetInsertUpdateCronStats(t *testing.T) {
}
var updatedResults []fleet.CronStats
err := sqlx.SelectContext(ctx, ds.reader, &updatedResults, "SELECT * FROM cron_stats")
err := sqlx.SelectContext(ctx, ds.reader, &updatedResults, "SELECT * FROM cron_stats ORDER BY id")
require.NoError(t, err)
require.Len(t, updatedResults, len(cases))
for i, r := range updatedResults {
@ -154,7 +154,7 @@ func TestCleanupCronStats(t *testing.T) {
},
{
createdAt: now.Add(-2 * time.Hour),
status: fleet.CronStatsStatusPending,
status: fleet.CronStatsStatusExpired,
shouldCleanupMaxPending: false,
shouldCleanupMaxAge: false,
},
@ -199,7 +199,9 @@ func TestCleanupCronStats(t *testing.T) {
require.Equal(t, cases[i].status, s.Status)
}
ds.CleanupCronStats(ctx)
err = ds.CleanupCronStats(ctx)
require.NoError(t, err)
stats = []fleet.CronStats{}
err = sqlx.SelectContext(ctx, ds.reader, &stats, `SELECT * FROM cron_stats ORDER BY id`)
require.NoError(t, err)

3
server/service/schedule/schedule_test.go
View file

@ -417,8 +417,7 @@ func TestScheduleHoldLock(t *testing.T) {
require.Equal(t, 4, ml.GetLockCount())
require.WithinRange(t, time.Now(),
start.Add(3*schedInterval).Add(jobDuration),
start.Add(3*schedInterval).Add(jobDuration).Add(1*time.Second),
)
start.Add(3*schedInterval).Add(jobDuration).Add(2*time.Second))
}
}