Revert " PLT-7 adding loc for db calls"

1 files changed, 56 insertions, 57 deletions

diff --git a/store/sql_user_store_test.go b/store/sql_user_store_test.go
index 50296b251..d1ee5e647 100644
--- a/store/sql_user_store_test.go
+++ b/store/sql_user_store_test.go
@@ -5,7 +5,6 @@ package store
 
 import (
 	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
 	"strings"
 	"testing"
 	"time"
@@ -19,27 +18,27 @@ func TestUserStoreSave(t *testing.T) {
 	u1.Username = model.NewId()
 	u1.TeamId = model.NewId()
 
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err != nil {
+	if err := (<-store.User().Save(&u1)).Err; err != nil {
 		t.Fatal("couldn't save user", err)
 	}
 
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil {
+	if err := (<-store.User().Save(&u1)).Err; err == nil {
 		t.Fatal("shouldn't be able to update user from save")
 	}
 
 	u1.Id = ""
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil {
+	if err := (<-store.User().Save(&u1)).Err; err == nil {
 		t.Fatal("should be unique email")
 	}
 
 	u1.Email = ""
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil {
+	if err := (<-store.User().Save(&u1)).Err; err == nil {
 		t.Fatal("should be unique username")
 	}
 
 	u1.Email = strings.Repeat("0123456789", 20)
 	u1.Username = ""
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil {
+	if err := (<-store.User().Save(&u1)).Err; err == nil {
 		t.Fatal("should be unique username")
 	}
 
@@ -47,7 +46,7 @@ func TestUserStoreSave(t *testing.T) {
 		u1.Id = ""
 		u1.Email = model.NewId()
 		u1.Username = model.NewId()
-		if err := (<-store.User().Save(utils.T, &u1)).Err; err != nil {
+		if err := (<-store.User().Save(&u1)).Err; err != nil {
 			t.Fatal("couldn't save item", err)
 		}
 	}
@@ -55,7 +54,7 @@ func TestUserStoreSave(t *testing.T) {
 	u1.Id = ""
 	u1.Email = model.NewId()
 	u1.Username = model.NewId()
-	if err := (<-store.User().Save(utils.T, &u1)).Err; err == nil {
+	if err := (<-store.User().Save(&u1)).Err; err == nil {
 		t.Fatal("should be the limit", err)
 	}
 }
@@ -66,21 +65,21 @@ func TestUserStoreUpdate(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	time.Sleep(100 * time.Millisecond)
 
-	if err := (<-store.User().Update(utils.T, &u1, false)).Err; err != nil {
+	if err := (<-store.User().Update(&u1, false)).Err; err != nil {
 		t.Fatal(err)
 	}
 
 	u1.Id = "missing"
-	if err := (<-store.User().Update(utils.T, &u1, false)).Err; err == nil {
+	if err := (<-store.User().Update(&u1, false)).Err; err == nil {
 		t.Fatal("Update should have failed because of missing key")
 	}
 
 	u1.Id = model.NewId()
-	if err := (<-store.User().Update(utils.T, &u1, false)).Err; err == nil {
+	if err := (<-store.User().Update(&u1, false)).Err; err == nil {
 		t.Fatal("Update should have faile because id change")
 	}
 }
@@ -91,13 +90,13 @@ func TestUserStoreUpdateLastPingAt(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().UpdateLastPingAt(utils.T, u1.Id, 1234567890)).Err; err != nil {
+	if err := (<-store.User().UpdateLastPingAt(u1.Id, 1234567890)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil {
+	if r1 := <-store.User().Get(u1.Id); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.User).LastPingAt != 1234567890 {
@@ -113,13 +112,13 @@ func TestUserStoreUpdateLastActivityAt(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().UpdateLastActivityAt(utils.T, u1.Id, 1234567890)).Err; err != nil {
+	if err := (<-store.User().UpdateLastActivityAt(u1.Id, 1234567890)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil {
+	if r1 := <-store.User().Get(u1.Id); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.User).LastActivityAt != 1234567890 {
@@ -135,13 +134,13 @@ func TestUserStoreUpdateFailedPasswordAttempts(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().UpdateFailedPasswordAttempts(utils.T, u1.Id, 3)).Err; err != nil {
+	if err := (<-store.User().UpdateFailedPasswordAttempts(u1.Id, 3)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil {
+	if r1 := <-store.User().Get(u1.Id); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.User).FailedAttempts != 3 {
@@ -157,18 +156,18 @@ func TestUserStoreUpdateUserAndSessionActivity(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	s1 := model.Session{}
 	s1.UserId = u1.Id
 	s1.TeamId = u1.TeamId
-	Must(store.Session().Save(utils.T, &s1))
+	Must(store.Session().Save(&s1))
 
-	if err := (<-store.User().UpdateUserAndSessionActivity(utils.T, u1.Id, s1.Id, 1234567890)).Err; err != nil {
+	if err := (<-store.User().UpdateUserAndSessionActivity(u1.Id, s1.Id, 1234567890)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil {
+	if r1 := <-store.User().Get(u1.Id); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.User).LastActivityAt != 1234567890 {
@@ -176,7 +175,7 @@ func TestUserStoreUpdateUserAndSessionActivity(t *testing.T) {
 		}
 	}
 
-	if r2 := <-store.Session().Get(utils.T, s1.Id); r2.Err != nil {
+	if r2 := <-store.Session().Get(s1.Id); r2.Err != nil {
 		t.Fatal(r2.Err)
 	} else {
 		if r2.Data.(*model.Session).LastActivityAt != 1234567890 {
@@ -192,9 +191,9 @@ func TestUserStoreGet(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if r1 := <-store.User().Get(utils.T, u1.Id); r1.Err != nil {
+	if r1 := <-store.User().Get(u1.Id); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		if r1.Data.(*model.User).ToJson() != u1.ToJson() {
@@ -202,7 +201,7 @@ func TestUserStoreGet(t *testing.T) {
 		}
 	}
 
-	if err := (<-store.User().Get(utils.T, "")).Err; err == nil {
+	if err := (<-store.User().Get("")).Err; err == nil {
 		t.Fatal("Missing id should have failed")
 	}
 }
@@ -213,9 +212,9 @@ func TestUserCount(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if result := <-store.User().GetTotalUsersCount(utils.T); result.Err != nil {
+	if result := <-store.User().GetTotalUsersCount(); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		count := result.Data.(int64)
@@ -231,9 +230,9 @@ func TestActiveUserCount(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if result := <-store.User().GetTotalActiveUsersCount(utils.T); result.Err != nil {
+	if result := <-store.User().GetTotalActiveUsersCount(); result.Err != nil {
 		t.Fatal(result.Err)
 	} else {
 		count := result.Data.(int64)
@@ -249,14 +248,14 @@ func TestUserStoreGetProfiles(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	u2 := model.User{}
 	u2.TeamId = u1.TeamId
 	u2.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u2))
+	Must(store.User().Save(&u2))
 
-	if r1 := <-store.User().GetProfiles(utils.T, u1.TeamId); r1.Err != nil {
+	if r1 := <-store.User().GetProfiles(u1.TeamId); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		users := r1.Data.(map[string]*model.User)
@@ -269,7 +268,7 @@ func TestUserStoreGetProfiles(t *testing.T) {
 		}
 	}
 
-	if r2 := <-store.User().GetProfiles(utils.T, "123"); r2.Err != nil {
+	if r2 := <-store.User().GetProfiles("123"); r2.Err != nil {
 		t.Fatal(r2.Err)
 	} else {
 		if len(r2.Data.(map[string]*model.User)) != 0 {
@@ -284,14 +283,14 @@ func TestUserStoreGetSystemAdminProfiles(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	u2 := model.User{}
 	u2.TeamId = u1.TeamId
 	u2.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u2))
+	Must(store.User().Save(&u2))
 
-	if r1 := <-store.User().GetSystemAdminProfiles(utils.T); r1.Err != nil {
+	if r1 := <-store.User().GetSystemAdminProfiles(); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		users := r1.Data.(map[string]*model.User)
@@ -307,13 +306,13 @@ func TestUserStoreGetByEmail(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email)).Err; err != nil {
+	if err := (<-store.User().GetByEmail(u1.TeamId, u1.Email)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if err := (<-store.User().GetByEmail(utils.T, "", "")).Err; err == nil {
+	if err := (<-store.User().GetByEmail("", "")).Err; err == nil {
 		t.Fatal("Should have failed because of missing email")
 	}
 }
@@ -326,13 +325,13 @@ func TestUserStoreGetByAuthData(t *testing.T) {
 	u1.Email = model.NewId()
 	u1.AuthData = "123"
 	u1.AuthService = "service"
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().GetByAuth(utils.T, u1.TeamId, u1.AuthData, u1.AuthService)).Err; err != nil {
+	if err := (<-store.User().GetByAuth(u1.TeamId, u1.AuthData, u1.AuthService)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if err := (<-store.User().GetByAuth(utils.T, "", "", "")).Err; err == nil {
+	if err := (<-store.User().GetByAuth("", "", "")).Err; err == nil {
 		t.Fatal("Should have failed because of missing auth data")
 	}
 }
@@ -344,13 +343,13 @@ func TestUserStoreGetByUsername(t *testing.T) {
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
 	u1.Username = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().GetByUsername(utils.T, u1.TeamId, u1.Username)).Err; err != nil {
+	if err := (<-store.User().GetByUsername(u1.TeamId, u1.Username)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if err := (<-store.User().GetByUsername(utils.T, "", "")).Err; err == nil {
+	if err := (<-store.User().GetByUsername("", "")).Err; err == nil {
 		t.Fatal("Should have failed because of missing username")
 	}
 }
@@ -361,15 +360,15 @@ func TestUserStoreUpdatePassword(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	hashedPassword := model.HashPassword("newpwd")
 
-	if err := (<-store.User().UpdatePassword(utils.T, u1.Id, hashedPassword)).Err; err != nil {
+	if err := (<-store.User().UpdatePassword(u1.Id, hashedPassword)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email); r1.Err != nil {
+	if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		user := r1.Data.(*model.User)
@@ -385,9 +384,9 @@ func TestUserStoreDelete(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
-	if err := (<-store.User().PermanentDelete(utils.T, u1.Id)).Err; err != nil {
+	if err := (<-store.User().PermanentDelete(u1.Id)).Err; err != nil {
 		t.Fatal(err)
 	}
 }
@@ -398,16 +397,16 @@ func TestUserStoreUpdateAuthData(t *testing.T) {
 	u1 := model.User{}
 	u1.TeamId = model.NewId()
 	u1.Email = model.NewId()
-	Must(store.User().Save(utils.T, &u1))
+	Must(store.User().Save(&u1))
 
 	service := "someservice"
 	authData := "1"
 
-	if err := (<-store.User().UpdateAuthData(utils.T, u1.Id, service, authData)).Err; err != nil {
+	if err := (<-store.User().UpdateAuthData(u1.Id, service, authData)).Err; err != nil {
 		t.Fatal(err)
 	}
 
-	if r1 := <-store.User().GetByEmail(utils.T, u1.TeamId, u1.Email); r1.Err != nil {
+	if r1 := <-store.User().GetByEmail(u1.TeamId, u1.Email); r1.Err != nil {
 		t.Fatal(r1.Err)
 	} else {
 		user := r1.Data.(*model.User)