fixing race condition in unit tests

1 files changed, 15 insertions, 15 deletions

diff --git a/api/post_test.go b/api/post_test.go
index 03f70bff7..5aeee7fe0 100644
--- a/api/post_test.go
+++ b/api/post_test.go
@@ -22,11 +22,11 @@ func TestCreatePost(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user2.Id)
+	<-Srv.Store.User().VerifyEmail(user2.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -104,7 +104,7 @@ func TestCreatePost(t *testing.T) {
 
 	user3 := &model.User{TeamId: team2.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user3.Id)
+	<-Srv.Store.User().VerifyEmail(user3.Id)
 
 	Client.LoginByEmail(team2.Domain, user3.Email, "pwd")
 
@@ -133,11 +133,11 @@ func TestCreateValetPost(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user2.Id)
+	<-Srv.Store.User().VerifyEmail(user2.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -189,7 +189,7 @@ func TestCreateValetPost(t *testing.T) {
 
 		user3 := &model.User{TeamId: team2.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 		user3 = Client.Must(Client.CreateUser(user3, "")).Data.(*model.User)
-		Srv.Store.User().VerifyEmail(user3.Id)
+		<-Srv.Store.User().VerifyEmail(user3.Id)
 
 		Client.LoginByEmail(team2.Domain, user3.Email, "pwd")
 
@@ -225,11 +225,11 @@ func TestUpdatePost(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user2.Id)
+	<-Srv.Store.User().VerifyEmail(user2.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -293,7 +293,7 @@ func TestGetPosts(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -358,7 +358,7 @@ func TestSearchPosts(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -404,7 +404,7 @@ func TestSearchHashtagPosts(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -435,7 +435,7 @@ func TestGetPostsCache(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -484,7 +484,7 @@ func TestDeletePosts(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -532,7 +532,7 @@ func TestEmailMention(t *testing.T) {
 
 	user1 := &model.User{TeamId: team.Id, Email: "corey@test.com", FullName: "Bob Bobby", Password: "pwd"}
 	user1 = Client.Must(Client.CreateUser(user1, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	Client.LoginByEmail(team.Domain, user1.Email, "pwd")
 
@@ -554,7 +554,7 @@ func TestFuzzyPosts(t *testing.T) {
 
 	user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", FullName: "Corey Hulen", Password: "pwd"}
 	user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
-	Srv.Store.User().VerifyEmail(user.Id)
+	<-Srv.Store.User().VerifyEmail(user.Id)
 
 	Client.LoginByEmail(team.Domain, user.Email, "pwd")