[MM-44365] Add values and operation to the condition checks (#20666)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e7a93e3f59
Коммит
1f1d3785fe
@@ -516,7 +516,7 @@ func testGroupStoreGetAllByType(t *testing.T, ss store.Store) {
|
|||||||
// Returns all the groups
|
// Returns all the groups
|
||||||
d1, err := ss.Group().GetAllBySource(model.GroupSourceLdap)
|
d1, err := ss.Group().GetAllBySource(model.GroupSourceLdap)
|
||||||
require.NoError(t, err)
|
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 {
|
for _, expectedGroup := range groups {
|
||||||
present := false
|
present := false
|
||||||
for _, dbGroup := range d1 {
|
for _, dbGroup := range d1 {
|
||||||
@@ -728,7 +728,7 @@ func testGroupStoreDelete(t *testing.T, ss store.Store) {
|
|||||||
d5, err := ss.Group().GetAllBySource(model.GroupSourceLdap)
|
d5, err := ss.Group().GetAllBySource(model.GroupSourceLdap)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
afterCount := len(d5)
|
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
|
// Try and delete a nonexistent group
|
||||||
_, err = ss.Group().Delete(model.NewId())
|
_, err = ss.Group().Delete(model.NewId())
|
||||||
@@ -1473,7 +1473,7 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) {
|
|||||||
// Returns all the group teams
|
// Returns all the group teams
|
||||||
d1, err := ss.Group().GetAllGroupSyncablesByGroupId(group.Id, model.GroupSyncableTypeTeam)
|
d1, err := ss.Group().GetAllGroupSyncablesByGroupId(group.Id, model.GroupSyncableTypeTeam)
|
||||||
require.NoError(t, err)
|
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 {
|
for _, expectedGroupTeam := range groupTeams {
|
||||||
present := false
|
present := false
|
||||||
for _, dbGroupTeam := range d1 {
|
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.SyncableId, groupTeam.SyncableId)
|
||||||
require.Equal(t, d1.AutoAdd, groupTeam.AutoAdd)
|
require.Equal(t, d1.AutoAdd, groupTeam.AutoAdd)
|
||||||
require.Equal(t, d1.CreateAt, groupTeam.CreateAt)
|
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
|
// Record already deleted
|
||||||
_, err = ss.Group().DeleteGroupSyncable(d1.GroupId, d1.SyncableId, d1.Type)
|
_, err = ss.Group().DeleteGroupSyncable(d1.GroupId, d1.SyncableId, d1.Type)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user