From 1f1d3785fe1f992db0cf65da555dc299af6e7db7 Mon Sep 17 00:00:00 2001 From: Tim Scheuermann Date: Tue, 19 Jul 2022 18:55:10 +0300 Subject: [PATCH] [MM-44365] Add values and operation to the condition checks (#20666) --- store/storetest/group_store.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go index ea15f2caace..e7a199da24b 100644 --- a/store/storetest/group_store.go +++ b/store/storetest/group_store.go @@ -516,7 +516,7 @@ func testGroupStoreGetAllByType(t *testing.T, ss store.Store) { // Returns all the groups d1, err := ss.Group().GetAllBySource(model.GroupSourceLdap) require.NoError(t, err) - require.Condition(t, func() bool { return len(d1) >= numGroups }) + require.Condition(t, func() bool { return len(d1) >= numGroups }, len(d1), ">=", numGroups) for _, expectedGroup := range groups { present := false for _, dbGroup := range d1 { @@ -728,7 +728,7 @@ func testGroupStoreDelete(t *testing.T, ss store.Store) { d5, err := ss.Group().GetAllBySource(model.GroupSourceLdap) require.NoError(t, err) afterCount := len(d5) - require.Condition(t, func() bool { return beforeCount == afterCount+1 }) + require.Condition(t, func() bool { return beforeCount == afterCount+1 }, beforeCount, "==", afterCount+1) // Try and delete a nonexistent group _, err = ss.Group().Delete(model.NewId()) @@ -1473,7 +1473,7 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) { // Returns all the group teams d1, err := ss.Group().GetAllGroupSyncablesByGroupId(group.Id, model.GroupSyncableTypeTeam) require.NoError(t, err) - require.Condition(t, func() bool { return len(d1) >= numGroupSyncables }) + require.Condition(t, func() bool { return len(d1) >= numGroupSyncables }, len(d1), ">=", numGroupSyncables) for _, expectedGroupTeam := range groupTeams { present := false for _, dbGroupTeam := range d1 { @@ -1602,7 +1602,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) { require.Equal(t, d1.SyncableId, groupTeam.SyncableId) require.Equal(t, d1.AutoAdd, groupTeam.AutoAdd) require.Equal(t, d1.CreateAt, groupTeam.CreateAt) - require.Condition(t, func() bool { return d1.UpdateAt > groupTeam.UpdateAt }) + require.Condition(t, func() bool { return d1.UpdateAt >= groupTeam.UpdateAt }, d1.UpdateAt, ">=", groupTeam.UpdateAt) // Record already deleted _, err = ss.Group().DeleteGroupSyncable(d1.GroupId, d1.SyncableId, d1.Type)