Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Fixing TestQueries/Save test. (#15729)

Browse source 
Fixing TestQueries/Save test.
This commit is contained in:
Victor Lyuboslavsky 2023-12-18 17:00:52 -06:00 committed by GitHub
parent 5bdb74c717
commit 0e51a26bf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
server/datastore/mysql/queries_test.go
View file

@ -385,23 +385,26 @@ func testQueriesSave(t *testing.T, ds *Datastore) {
query.Query = "baz2"
err = ds.SaveQuery(context.Background(), query, true, true)
require.NoError(t, err)
actual, err = ds.Query(context.Background(), query.ID)
require.NoError(t, err)
require.NotNil(t, actual)
// The query now comes with stats, so we need to fill them in for comparison
query.AggregatedStats = fleet.AggregatedStats{
SystemTimeP50: ptr.Float64(0),
SystemTimeP95: ptr.Float64(0),
UserTimeP50: ptr.Float64(0),
UserTimeP95: ptr.Float64(0),
TotalExecutions: ptr.Float64(1),
// Ensure stats were deleted.
// The actual delete occurs asynchronously, so we for-loop.
aggStatsGone := make(chan bool)
go func() {
for {
actual, err = ds.Query(context.Background(), query.ID)
require.NoError(t, err)
require.NotNil(t, actual)
if actual.AggregatedStats.TotalExecutions == nil {
aggStatsGone <- true
break
}
}
}()
select {
case <-aggStatsGone:
case <-time.After(2 * time.Second):
t.Error("Timeout: aggregated stats not deleted for query")
}
test.QueriesMatch(t, query, actual)
// Ensure stats were deleted.
// The actual delete occurs asynchronously, so enough time should have passed
// to ensure the original query completed.
time.Sleep(10 * time.Millisecond)
stats, err := ds.GetLiveQueryStats(context.Background(), query.ID, []uint{hostID})
require.NoError(t, err)
require.Equal(t, 0, len(stats))