From 02b2c64b893bd256bb9f41ebfaf091f0094cd393 Mon Sep 17 00:00:00 2001 From: Tomas Touceda Date: Tue, 5 Oct 2021 18:26:02 -0300 Subject: [PATCH] Make software list not flaky, hopefully (#2387) --- server/datastore/mysql/software_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/datastore/mysql/software_test.go b/server/datastore/mysql/software_test.go index 2df9e9bfde..5162113239 100644 --- a/server/datastore/mysql/software_test.go +++ b/server/datastore/mysql/software_test.go @@ -425,7 +425,7 @@ func testSoftwareList(t *testing.T, ds *Datastore) { }) t.Run("limits the results", func(t *testing.T) { - software, err := ds.ListSoftware(context.Background(), nil, fleet.ListOptions{PerPage: 1}) + software, err := ds.ListSoftware(context.Background(), nil, fleet.ListOptions{PerPage: 1, OrderKey: "version"}) require.NoError(t, err) require.Len(t, software, 1) @@ -434,11 +434,11 @@ func testSoftwareList(t *testing.T, ds *Datastore) { }) t.Run("paginates", func(t *testing.T) { - software, err := ds.ListSoftware(context.Background(), nil, fleet.ListOptions{Page: 1, PerPage: 1}) + software, err := ds.ListSoftware(context.Background(), nil, fleet.ListOptions{Page: 1, PerPage: 1, OrderKey: "version"}) require.NoError(t, err) require.Len(t, software, 1) - expected := []fleet.Software{foo003} + expected := []fleet.Software{foo002} test.ElementsMatchSkipID(t, software, expected) }) @@ -447,7 +447,7 @@ func testSoftwareList(t *testing.T, ds *Datastore) { require.NoError(t, err) require.NoError(t, ds.AddHostsToTeam(context.Background(), &team1.ID, []uint{host1.ID})) - software, err := ds.ListSoftware(context.Background(), &team1.ID, fleet.ListOptions{}) + software, err := ds.ListSoftware(context.Background(), &team1.ID, fleet.ListOptions{OrderKey: "version"}) require.NoError(t, err) require.Len(t, software, 2)