From b8b36e33d6f9a48023c621f16f5adb9c8d0f684d Mon Sep 17 00:00:00 2001 From: Michael Kochell <6913320+mickmister@users.noreply.github.com> Date: Mon, 22 Jun 2020 23:01:28 -0400 Subject: [PATCH] Fix ResetLastPictureUpdate flaky test (#14856) * Ensure time is different when second update operation occurs * Change all sleeps to one ms Co-authored-by: Mattermod --- store/storetest/user_store.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index ea0276b183..982be5898d 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -2042,7 +2042,7 @@ func testUserStoreUpdateMfaActive(t *testing.T, ss store.Store) { require.Nil(t, err) defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() - time.Sleep(100 * time.Millisecond) + time.Sleep(time.Millisecond) err = ss.User().UpdateMfaActive(u1.Id, true) require.Nil(t, err) @@ -3362,7 +3362,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { require.Nil(t, err) // Ensure update at timestamp changes - time.Sleep(time.Millisecond * 10) + time.Sleep(time.Millisecond) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -3374,7 +3374,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { require.Nil(t, err) // Ensure update at timestamp changes - time.Sleep(time.Millisecond * 10) + time.Sleep(time.Millisecond) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -3424,7 +3424,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) // Ensure update at timestamp changes - time.Sleep(time.Millisecond * 10) + time.Sleep(time.Millisecond) // Add u2 to team 1 _, err = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) @@ -3446,7 +3446,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) // Ensure update at timestamp changes - time.Sleep(time.Millisecond * 10) + time.Sleep(time.Millisecond) e := ss.Team().RemoveMember(teamId, u1.Id) require.Nil(t, e) @@ -3475,7 +3475,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { }) // Ensure update at timestamp changes - time.Sleep(time.Millisecond * 10) + time.Sleep(time.Millisecond) u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -3690,7 +3690,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { }) require.Nil(t, err) - time.Sleep(10 * time.Millisecond) + time.Sleep(time.Millisecond) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -3717,7 +3717,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { require.Nil(t, err) startTime := u2.CreateAt - time.Sleep(10 * time.Millisecond) + time.Sleep(time.Millisecond) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -4755,6 +4755,9 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) { assert.NotZero(t, user.LastPictureUpdate) assert.NotZero(t, user.UpdateAt) + // Ensure update at timestamp changes + time.Sleep(time.Millisecond) + err = ss.User().ResetLastPictureUpdate(u1.Id) require.Nil(t, err)