diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:06:56 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-05 09:06:56 -0800 |
| commit | ec2af296b25d6edef0fea54a8af02bed912c6e37 (patch) | |
| tree | f5d9dda732570d1d59f6686db087416c57aa10e4 /api/file_test.go | |
| parent | 592d68cf4134b668e3ff962d17f8aa75b1bc055f (diff) | |
| download | chat-ec2af296b25d6edef0fea54a8af02bed912c6e37.tar.gz chat-ec2af296b25d6edef0fea54a8af02bed912c6e37.tar.bz2 chat-ec2af296b25d6edef0fea54a8af02bed912c6e37.zip | |
fixing race condition in unit tests
Diffstat (limited to 'api/file_test.go')
| -rw-r--r-- | api/file_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/api/file_test.go b/api/file_test.go index 6fd231165..e248cfac3 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -28,7 +28,7 @@ func TestUploadFile(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") @@ -115,7 +115,7 @@ func TestGetFile(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") @@ -177,7 +177,7 @@ func TestGetFile(t *testing.T) { user2 := &model.User{TeamId: team2.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) newProps := make(map[string]string) newProps["filename"] = filenames[0] @@ -262,11 +262,11 @@ func TestGetPublicLink(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") |