Migrate User.PermanentDelete to Sync by default (#10876)

app/bot.go

@@ -18,7 +18,7 @@ func (a *App) CreateBot(bot *model.Bot) (*model.Bot, *model.AppError) {
 
 	result = <-a.Srv.Store.Bot().Save(bot)
 	if result.Err != nil {
-		<-a.Srv.Store.User().PermanentDelete(bot.UserId)
+		a.Srv.Store.User().PermanentDelete(bot.UserId)
 		return nil, result.Err
 	}
 
@@ -119,8 +119,8 @@ func (a *App) PermanentDeleteBot(botUserId string) *model.AppError {
 		return result.Err
 	}
 
-	if result := <-a.Srv.Store.User().PermanentDelete(botUserId); result.Err != nil {
-		return result.Err
+	if err := a.Srv.Store.User().PermanentDelete(botUserId); err != nil {
+		return err
 	}
 
 	return nil

app/user.go

@@ -1483,8 +1483,8 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
 		return err
 	}
 
-	if result := <-a.Srv.Store.User().PermanentDelete(user.Id); result.Err != nil {
-		return result.Err
+	if err := a.Srv.Store.User().PermanentDelete(user.Id); err != nil {
+		return err
 	}
 
 	if err := a.Srv.Store.Audit().PermanentDeleteByUser(user.Id); err != nil {

store/sqlstore/user_store.go

@@ -1093,12 +1093,11 @@ func (us SqlUserStore) VerifyEmail(userId, email string) store.StoreChannel {
 	})
 }
 
-func (us SqlUserStore) PermanentDelete(userId string) store.StoreChannel {
-	return store.Do(func(result *store.StoreResult) {
-		if _, err := us.GetMaster().Exec("DELETE FROM Users WHERE Id = :UserId", map[string]interface{}{"UserId": userId}); err != nil {
-			result.Err = model.NewAppError("SqlUserStore.PermanentDelete", "store.sql_user.permanent_delete.app_error", nil, "userId="+userId+", "+err.Error(), http.StatusInternalServerError)
-		}
-	})
+func (us SqlUserStore) PermanentDelete(userId string) *model.AppError {
+	if _, err := us.GetMaster().Exec("DELETE FROM Users WHERE Id = :UserId", map[string]interface{}{"UserId": userId}); err != nil {
+		return model.NewAppError("SqlUserStore.PermanentDelete", "store.sql_user.permanent_delete.app_error", nil, "userId="+userId+", "+err.Error(), http.StatusInternalServerError)
+	}
+	return nil
 }
 
 func (us SqlUserStore) Count(options model.UserCountOptions) store.StoreChannel {

store/store.go

@@ -278,7 +278,7 @@ type UserStore interface {
 	GetEtagForProfiles(teamId string) StoreChannel
 	UpdateFailedPasswordAttempts(userId string, attempts int) StoreChannel
 	GetSystemAdminProfiles() StoreChannel
-	PermanentDelete(userId string) StoreChannel
+	PermanentDelete(userId string) *model.AppError
 	AnalyticsActiveCount(time int64) StoreChannel
 	GetUnreadCount(userId string) StoreChannel
 	GetUnreadCountForChannel(userId string, channelId string) StoreChannel

store/storetest/bot_store.go

@@ -39,7 +39,7 @@ func testBotStoreGet(t *testing.T, ss store.Store) {
 	deletedBot.DeleteAt = 1
 	deletedBot = store.Must(ss.Bot().Update(deletedBot)).(*model.Bot)
 	defer func() { store.Must(ss.Bot().PermanentDelete(deletedBot.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(deletedBot.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(deletedBot.UserId)) }()
 
 	permanentlyDeletedBot, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "permanently_deleted_bot",
@@ -48,7 +48,7 @@ func testBotStoreGet(t *testing.T, ss store.Store) {
 		DeleteAt:    0,
 	})
 	store.Must(ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId))
-	defer func() { store.Must(ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
 
 	b1, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "b1",
@@ -56,7 +56,7 @@ func testBotStoreGet(t *testing.T, ss store.Store) {
 		OwnerId:     model.NewId(),
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b1.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b1.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }()
 
 	b2, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "b2",
@@ -64,7 +64,7 @@ func testBotStoreGet(t *testing.T, ss store.Store) {
 		OwnerId:     model.NewId(),
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b2.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b2.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }()
 
 	t.Run("get non-existent bot", func(t *testing.T) {
 		result := <-ss.Bot().Get("unknown", false)
@@ -115,7 +115,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 	deletedBot.DeleteAt = 1
 	deletedBot = store.Must(ss.Bot().Update(deletedBot)).(*model.Bot)
 	defer func() { store.Must(ss.Bot().PermanentDelete(deletedBot.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(deletedBot.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(deletedBot.UserId)) }()
 
 	permanentlyDeletedBot, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "permanently_deleted_bot",
@@ -124,7 +124,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 		DeleteAt:    0,
 	})
 	store.Must(ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId))
-	defer func() { store.Must(ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }()
 
 	b1, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "b1",
@@ -132,7 +132,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 		OwnerId:     OwnerId1,
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b1.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b1.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }()
 
 	b2, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "b2",
@@ -140,7 +140,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 		OwnerId:     OwnerId1,
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b2.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b2.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }()
 
 	t.Run("get original bots", func(t *testing.T) {
 		result := <-ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10})
@@ -157,7 +157,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 		OwnerId:     OwnerId1,
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b3.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b3.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b3.UserId)) }()
 
 	b4, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "b4",
@@ -165,7 +165,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 		OwnerId:     OwnerId2,
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b4.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b4.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b4.UserId)) }()
 
 	deletedUser := model.User{
 		Email:    MakeEmail(),
@@ -178,14 +178,14 @@ func testBotStoreGetAll(t *testing.T, ss store.Store) {
 	if err := (<-ss.User().Update(&deletedUser, true)).Err; err != nil {
 		t.Fatal("couldn't delete user", err)
 	}
-	defer func() { store.Must(ss.User().PermanentDelete(deletedUser.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(deletedUser.Id)) }()
 	ob5, _ := makeBotWithUser(ss, &model.Bot{
 		Username:    "ob5",
 		Description: "Orphaned bot 5",
 		OwnerId:     deletedUser.Id,
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b4.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b4.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b4.UserId)) }()
 
 	t.Run("get newly created bot stoo", func(t *testing.T) {
 		result := <-ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10})
@@ -308,7 +308,7 @@ func testBotStoreSave(t *testing.T, ss store.Store) {
 		}
 
 		user := store.Must(ss.User().Save(model.UserFromBot(bot))).(*model.User)
-		defer func() { store.Must(ss.User().PermanentDelete(user.Id)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }()
 		bot.UserId = user.Id
 
 		result := <-ss.Bot().Save(bot)
@@ -341,7 +341,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) {
 			OwnerId:  model.NewId(),
 		})
 		defer func() { store.Must(ss.Bot().PermanentDelete(existingBot.UserId)) }()
-		defer func() { store.Must(ss.User().PermanentDelete(existingBot.UserId)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }()
 
 		bot := existingBot.Clone()
 		bot.Username = "invalid username"
@@ -356,7 +356,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) {
 			OwnerId:  model.NewId(),
 		})
 		defer func() { store.Must(ss.Bot().PermanentDelete(existingBot.UserId)) }()
-		defer func() { store.Must(ss.User().PermanentDelete(existingBot.UserId)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }()
 
 		bot := existingBot.Clone()
 		bot.OwnerId = model.NewId()
@@ -389,7 +389,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) {
 			OwnerId:  model.NewId(),
 		})
 		defer func() { store.Must(ss.Bot().PermanentDelete(existingBot.UserId)) }()
-		defer func() { store.Must(ss.User().PermanentDelete(existingBot.UserId)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }()
 
 		existingBot.DeleteAt = 100000
 		existingBot = store.Must(ss.Bot().Update(existingBot)).(*model.Bot)
@@ -418,14 +418,14 @@ func testBotStorePermanentDelete(t *testing.T, ss store.Store) {
 		OwnerId:  model.NewId(),
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b1.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b1.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }()
 
 	b2, _ := makeBotWithUser(ss, &model.Bot{
 		Username: "b2",
 		OwnerId:  model.NewId(),
 	})
 	defer func() { store.Must(ss.Bot().PermanentDelete(b2.UserId)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(b2.UserId)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }()
 
 	t.Run("permanently delete a non-existent bot", func(t *testing.T) {
 		result := <-ss.Bot().PermanentDelete("unknown")

store/storetest/mocks/UserStore.go

@@ -619,15 +619,15 @@ func (_m *UserStore) InvalidateProfilesInChannelCacheByUser(userId string) {
 }
 
 // PermanentDelete provides a mock function with given fields: userId
-func (_m *UserStore) PermanentDelete(userId string) store.StoreChannel {
+func (_m *UserStore) PermanentDelete(userId string) *model.AppError {
 	ret := _m.Called(userId)
 
-	var r0 store.StoreChannel
-	if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
+	var r0 *model.AppError
+	if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
 		r0 = rf(userId)
 	} else {
 		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(store.StoreChannel)
+			r0 = ret.Get(0).(*model.AppError)
 		}
 	}
 

store/storetest/team_store.go

@@ -955,7 +955,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
 		})).(*model.User).Id
 
 		defer func(userId string) {
-			<-ss.User().PermanentDelete(userId)
+			ss.User().PermanentDelete(userId)
 		}(userIds[i])
 
 		store.Must(ss.Team().SaveMember(&model.TeamMember{
@@ -979,7 +979,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 	})).(*model.User).Id
 	defer func() {
-		<-ss.User().PermanentDelete(newUserId)
+		ss.User().PermanentDelete(newUserId)
 	}()
 
 	if result := <-ss.Team().SaveMember(&model.TeamMember{

store/storetest/user_store.go

@@ -21,8 +21,8 @@ func TestUserStore(t *testing.T, ss store.Store) {
 	users := result.Data.([]*model.User)
 
 	for _, u := range users {
-		result := <-ss.User().PermanentDelete(u.Id)
-		require.Nil(t, result.Err, "failed cleaning up test user %s", u.Username)
+		err := ss.User().PermanentDelete(u.Id)
+		require.Nil(t, err, "failed cleaning up test user %s", u.Username)
 	}
 
 	t.Run("Count", func(t *testing.T) { testCount(t, ss) })
@@ -81,7 +81,7 @@ func testUserStoreSave(t *testing.T, ss store.Store) {
 	if err := (<-ss.User().Save(&u1)).Err; err != nil {
 		t.Fatal("couldn't save user", err)
 	}
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam))
 
@@ -116,7 +116,7 @@ func testUserStoreSave(t *testing.T, ss store.Store) {
 		if err := (<-ss.User().Save(&u)).Err; err != nil {
 			t.Fatal("couldn't save item", err)
 		}
-		defer func() { store.Must(ss.User().PermanentDelete(u.Id)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(u.Id)) }()
 
 		store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam))
 	}
@@ -127,7 +127,7 @@ func testUserStoreSave(t *testing.T, ss store.Store) {
 	if err := (<-ss.User().Save(&u2)).Err; err != nil {
 		t.Fatal("couldn't save item", err)
 	}
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	if err := (<-ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam)).Err; err == nil {
 		t.Fatal("should be the limit")
@@ -139,7 +139,7 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) {
 		Email: MakeEmail(),
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1))
 
 	u2 := &model.User{
@@ -147,7 +147,7 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) {
 		AuthService: "ldap",
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1))
 
 	time.Sleep(100 * time.Millisecond)
@@ -179,7 +179,7 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) {
 	}
 	oldEmail := u3.Email
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1))
 
 	u3.Email = MakeEmail()
@@ -211,7 +211,7 @@ func testUserStoreUpdateUpdateAt(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1))
 
 	time.Sleep(10 * time.Millisecond)
@@ -232,7 +232,7 @@ func testUserStoreUpdateFailedPasswordAttempts(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1))
 
 	if err := (<-ss.User().UpdateFailedPasswordAttempts(u1.Id, 3)).Err; err != nil {
@@ -251,7 +251,7 @@ func testUserStoreGet(t *testing.T, ss store.Store) {
 		Email: MakeEmail(),
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
@@ -264,7 +264,7 @@ func testUserStoreGet(t *testing.T, ss store.Store) {
 	}))
 	u2.IsBot = true
 	defer func() { store.Must(ss.Bot().PermanentDelete(u2.Id)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1))
 
@@ -296,7 +296,7 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) {
 		Username:    "u1" + model.NewId(),
 		AuthService: "service",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
@@ -304,7 +304,7 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) {
 		Username:    "u2" + model.NewId(),
 		AuthService: "service",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
@@ -312,7 +312,7 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) {
 		Username:    "u3" + model.NewId(),
 		AuthService: "service2",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -321,7 +321,7 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) {
 	}))
 	u3.IsBot = true
 	defer func() { store.Must(ss.Bot().PermanentDelete(u3.Id)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 
 	t.Run("get by unknown auth service", func(t *testing.T) {
 		result := <-ss.User().GetAllUsingAuthService("unknown")
@@ -356,13 +356,13 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
@@ -375,21 +375,21 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 	}))
 	u3.IsBot = true
 	defer func() { store.Must(ss.Bot().PermanentDelete(u3.Id)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 
 	u4 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u4" + model.NewId(),
 		Roles:    "system_user some-other-role",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 
 	u5 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u5" + model.NewId(),
 		Roles:    "system_admin",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u5.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }()
 
 	u6 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
@@ -397,14 +397,14 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 		DeleteAt: model.GetMillis(),
 		Roles:    "system_admin",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u6.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }()
 
 	u7 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u7" + model.NewId(),
 		DeleteAt: model.GetMillis(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u7.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u7.Id)) }()
 
 	t.Run("get offset 0, limit 100", func(t *testing.T) {
 		options := &model.UserGetOptions{Page: 0, PerPage: 100}
@@ -459,7 +459,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
 		uNew := &model.User{}
 		uNew.Email = MakeEmail()
 		store.Must(ss.User().Save(uNew))
-		defer func() { store.Must(ss.User().PermanentDelete(uNew.Id)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(uNew.Id)) }()
 
 		result = <-ss.User().GetEtagForAllProfiles()
 		require.Nil(t, result.Err)
@@ -518,14 +518,14 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
@@ -539,7 +539,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) {
 	}))
 	u3.IsBot = true
 	defer func() { store.Must(ss.Bot().PermanentDelete(u3.Id)) }()
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 
 	u4 := store.Must(ss.User().Save(&model.User{
@@ -547,7 +547,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) {
 		Username: "u4" + model.NewId(),
 		Roles:    "system_admin",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1))
 
 	u5 := store.Must(ss.User().Save(&model.User{
@@ -555,7 +555,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) {
 		Username: "u5" + model.NewId(),
 		DeleteAt: model.GetMillis(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u5.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1))
 
 	t.Run("get page 0, perPage 100", func(t *testing.T) {
@@ -608,7 +608,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) {
 		uNew := &model.User{}
 		uNew.Email = MakeEmail()
 		store.Must(ss.User().Save(uNew))
-		defer func() { store.Must(ss.User().PermanentDelete(uNew.Id)) }()
+		defer func() { require.Nil(t, ss.User().PermanentDelete(uNew.Id)) }()
 		store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1))
 
 		result = <-ss.User().GetEtagForProfiles(teamId)
@@ -654,21 +654,21 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -742,21 +742,21 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -837,20 +837,20 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -885,21 +885,21 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -992,21 +992,21 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1133,21 +1133,21 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1196,21 +1196,21 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1259,14 +1259,14 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
 		Roles:    model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
@@ -1274,7 +1274,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
 		Roles:    model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1301,21 +1301,21 @@ func testUserStoreGetByEmail(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1367,14 +1367,14 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) {
 		AuthData:    &auth1,
 		AuthService: "service",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
@@ -1383,7 +1383,7 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) {
 		AuthData:    &auth3,
 		AuthService: "service2",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1433,21 +1433,21 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1500,7 +1500,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 		AuthService: model.USER_AUTH_SERVICE_GITLAB,
 		AuthData:    &auth,
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
@@ -1509,7 +1509,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 		AuthService: model.USER_AUTH_SERVICE_LDAP,
 		AuthData:    &auth2,
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
@@ -1518,7 +1518,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
 		AuthService: model.USER_AUTH_SERVICE_LDAP,
 		AuthData:    &auth3,
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1577,7 +1577,7 @@ func testUserStoreUpdatePassword(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	hashedPassword := model.HashPassword("newpwd")
@@ -1600,10 +1600,10 @@ func testUserStoreDelete(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1))
 
-	if err := (<-ss.User().PermanentDelete(u1.Id)).Err; err != nil {
+	if err := ss.User().PermanentDelete(u1.Id); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -1614,7 +1614,7 @@ func testUserStoreUpdateAuthData(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	service := "someservice"
@@ -1659,14 +1659,14 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
 	u1.Username = "user1" + model.NewId()
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := &model.User{}
 	u2.Email = MakeEmail()
 	u2.Username = "user2" + model.NewId()
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	if err := (<-ss.Channel().Save(&c1, -1)).Err; err != nil {
@@ -1737,7 +1737,7 @@ func testUserStoreUpdateMfaSecret(t *testing.T, ss store.Store) {
 	u1 := model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(&u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	time.Sleep(100 * time.Millisecond)
 
@@ -1755,7 +1755,7 @@ func testUserStoreUpdateMfaActive(t *testing.T, ss store.Store) {
 	u1 := model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(&u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	time.Sleep(100 * time.Millisecond)
 
@@ -1780,21 +1780,21 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1848,21 +1848,21 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1))
 
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1))
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
@@ -1876,7 +1876,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u4" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1))
 
 	t.Run("get team 1, offset 0, limit 100", func(t *testing.T) {
@@ -1956,7 +1956,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 		Roles:     "system_user system_admin",
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := &model.User{
 		Username: "jim-bobby" + model.NewId(),
@@ -1964,7 +1964,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 		Roles:    "system_user",
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := &model.User{
 		Username: "jimbo3" + model.NewId(),
@@ -1973,7 +1973,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 		Roles:    "system_admin",
 	}
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -1990,7 +1990,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 		Email:     MakeEmail(),
 	}
 	store.Must(ss.User().Save(u5))
-	defer func() { store.Must(ss.User().PermanentDelete(u5.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }()
 
 	u6 := &model.User{
 		Username:  "underscore" + model.NewId(),
@@ -2000,7 +2000,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
 		Email:     MakeEmail(),
 	}
 	store.Must(ss.User().Save(u6))
-	defer func() { store.Must(ss.User().PermanentDelete(u6.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }()
 
 	tid := model.NewId()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1))
@@ -2295,14 +2295,14 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 		Email:     "harold" + model.NewId() + "@simulator.amazonses.com",
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := &model.User{
 		Username: "jim2-bobby" + model.NewId(),
 		Email:    MakeEmail(),
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := &model.User{
 		Username: "jimbo3" + model.NewId(),
@@ -2310,7 +2310,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
 		DeleteAt: 1,
 	}
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -2509,14 +2509,14 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 		Email:     "harold" + model.NewId() + "@simulator.amazonses.com",
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := &model.User{
 		Username: "jim-bobby" + model.NewId(),
 		Email:    MakeEmail(),
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := &model.User{
 		Username: "jimbo3" + model.NewId(),
@@ -2524,7 +2524,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
 		DeleteAt: 1,
 	}
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -2662,14 +2662,14 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 		Email:     "harold" + model.NewId() + "@simulator.amazonses.com",
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := &model.User{
 		Username: "jim-bobby" + model.NewId(),
 		Email:    MakeEmail(),
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := &model.User{
 		Username: "jimbo3" + model.NewId(),
@@ -2677,7 +2677,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 		DeleteAt: 1,
 	}
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -2692,7 +2692,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 		DeleteAt: 0,
 	}
 	store.Must(ss.User().Save(u4))
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 
 	u5 := &model.User{
 		Username:  "yu" + model.NewId(),
@@ -2702,7 +2702,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 		Email:     MakeEmail(),
 	}
 	store.Must(ss.User().Save(u5))
-	defer func() { store.Must(ss.User().PermanentDelete(u5.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }()
 
 	u6 := &model.User{
 		Username:  "underscore" + model.NewId(),
@@ -2712,7 +2712,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
 		Email:     MakeEmail(),
 	}
 	store.Must(ss.User().Save(u6))
-	defer func() { store.Must(ss.User().PermanentDelete(u6.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }()
 
 	teamId1 := model.NewId()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1))
@@ -2841,14 +2841,14 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
 		Email:     "harold" + model.NewId() + "@simulator.amazonses.com",
 	}
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := &model.User{
 		Username: "jim2-bobby" + model.NewId(),
 		Email:    MakeEmail(),
 	}
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	u3 := &model.User{
 		Username: "jimbo3" + model.NewId(),
@@ -2856,7 +2856,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
 		DeleteAt: 1,
 	}
 	store.Must(ss.User().Save(u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -2938,7 +2938,7 @@ func testCount(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	// Deleted
@@ -2946,13 +2946,13 @@ func testCount(t *testing.T, ss store.Store) {
 	u2.Email = MakeEmail()
 	u2.DeleteAt = model.GetMillis()
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	// Bot
 	u3 := store.Must(ss.User().Save(&model.User{
 		Email: MakeEmail(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -3041,7 +3041,7 @@ func testUserStoreAnalyticsGetInactiveUsersCount(t *testing.T, ss store.Store) {
 	u1 := &model.User{}
 	u1.Email = MakeEmail()
 	store.Must(ss.User().Save(u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	var count int64
 
@@ -3055,7 +3055,7 @@ func testUserStoreAnalyticsGetInactiveUsersCount(t *testing.T, ss store.Store) {
 	u2.Email = MakeEmail()
 	u2.DeleteAt = model.GetMillis()
 	store.Must(ss.User().Save(u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	if result := <-ss.User().AnalyticsGetInactiveUsersCount(); result.Err != nil {
 		t.Fatal(result.Err)
@@ -3087,12 +3087,12 @@ func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, ss store.Store) {
 	if err := (<-ss.User().Save(&u1)).Err; err != nil {
 		t.Fatal("couldn't save user", err)
 	}
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	if err := (<-ss.User().Save(&u2)).Err; err != nil {
 		t.Fatal("couldn't save user", err)
 	}
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 
 	if result := <-ss.User().AnalyticsGetSystemAdminCount(); result.Err != nil {
 		t.Fatal(result.Err)
@@ -3119,7 +3119,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u1" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1))
 
 	// Ensure update at timestamp changes
@@ -3129,7 +3129,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1))
 
 	// Ensure update at timestamp changes
@@ -3139,7 +3139,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u3" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u3.Id,
 		Username: u3.Username,
@@ -3237,7 +3237,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
 		Email:    MakeEmail(),
 		Username: "u4" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 	store.Must(ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1))
 
 	t.Run("etag for profiles not in team 1 after addition to team", func(t *testing.T) {
@@ -3325,13 +3325,13 @@ func testUserStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) {
 	}
 
 	store.Must(ss.User().Save(&u1))
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 	store.Must(ss.User().Save(&u2))
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.User().Save(&u3))
-	defer func() { store.Must(ss.User().PermanentDelete(u3.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }()
 	store.Must(ss.User().Save(&u4))
-	defer func() { store.Must(ss.User().PermanentDelete(u4.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }()
 
 	require.Nil(t, (<-ss.User().ClearAllCustomRoleAssignments()).Err)
 
@@ -3358,13 +3358,13 @@ func testUserStoreGetAllAfter(t *testing.T, ss store.Store) {
 		Username: model.NewId(),
 		Roles:    "system_user system_admin system_post_all",
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u1.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
 
 	u2 := store.Must(ss.User().Save(&model.User{
 		Email:    MakeEmail(),
 		Username: "u2" + model.NewId(),
 	})).(*model.User)
-	defer func() { store.Must(ss.User().PermanentDelete(u2.Id)) }()
+	defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }()
 	store.Must(ss.Bot().Save(&model.Bot{
 		UserId:   u2.Id,
 		Username: u2.Username,