fixing race condition in unit tests

api/command_test.go

@@ -16,7 +16,7 @@ func TestSuggestRootCommands(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")
 
@@ -59,7 +59,7 @@ func TestLogoutCommands(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")
 
@@ -77,7 +77,7 @@ func TestJoinCommands(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")
 
@@ -91,7 +91,7 @@ func TestJoinCommands(t *testing.T) {
 
 	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(user1.Id)
+	<-Srv.Store.User().VerifyEmail(user1.Id)
 
 	data := make(map[string]string)
 	data["user_id"] = user2.Id