From b968ef04a0f2837313c1b08462cf6f530c54853b Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 10:04:01 -0800 Subject: fixing unit test --- store/sql_team_store_test.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'store/sql_team_store_test.go') diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 1b03b75fd..c2f2a4d00 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -39,7 +39,9 @@ func TestTeamStoreUpdate(t *testing.T) { o1.Domain = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - <-store.Team().Save(&o1) + if err := (<-store.Team().Save(&o1)).Err; err != nil { + t.Fatal(err) + } if err := (<-store.Team().Update(&o1)).Err; err != nil { t.Fatal(err) -- cgit v1.2.3-1-g7c22 From 4af59ee357b6721c820397f2278258a4a0407625 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 10:22:07 -0800 Subject: fixing unit test --- store/sql_team_store_test.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'store/sql_team_store_test.go') diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index c2f2a4d00..106648a81 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -6,6 +6,7 @@ package store import ( "github.com/mattermost/platform/model" "testing" + "time" ) func TestTeamStoreSave(t *testing.T) { @@ -21,6 +22,8 @@ func TestTeamStoreSave(t *testing.T) { t.Fatal("couldn't save item", err) } + time.Sleep(100 * time.Millisecond) + if err := (<-store.Team().Save(&o1)).Err; err == nil { t.Fatal("shouldn't be able to update from save") } -- cgit v1.2.3-1-g7c22 From b95e053d41582866bf5f77ef69f784843c37676b Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Sun, 5 Jul 2015 10:22:52 -0800 Subject: fixing unit test --- store/sql_team_store_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'store/sql_team_store_test.go') diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 106648a81..4722017e8 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -22,8 +22,6 @@ func TestTeamStoreSave(t *testing.T) { t.Fatal("couldn't save item", err) } - time.Sleep(100 * time.Millisecond) - if err := (<-store.Team().Save(&o1)).Err; err == nil { t.Fatal("shouldn't be able to update from save") } @@ -46,6 +44,8 @@ func TestTeamStoreUpdate(t *testing.T) { t.Fatal(err) } + time.Sleep(100 * time.Millisecond) + if err := (<-store.Team().Update(&o1)).Err; err != nil { t.Fatal(err) } -- cgit v1.2.3-1-g7c22 From 34fb817a4a4cd2761ba35a2c94f9d0eb79d06244 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Mon, 6 Jul 2015 00:50:42 -0800 Subject: Fixing unit tests --- store/sql_team_store_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'store/sql_team_store_test.go') diff --git a/store/sql_team_store_test.go b/store/sql_team_store_test.go index 4722017e8..bd1a7de2e 100644 --- a/store/sql_team_store_test.go +++ b/store/sql_team_store_test.go @@ -91,7 +91,7 @@ func TestTeamStoreGet(t *testing.T) { o1.Domain = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - <-store.Team().Save(&o1) + Must(store.Team().Save(&o1)) if r1 := <-store.Team().Get(o1.Id); r1.Err != nil { t.Fatal(r1.Err) @@ -140,12 +140,12 @@ func TestTeamStoreGetForEmail(t *testing.T) { o1.Domain = "a" + model.NewId() + "b" o1.Email = model.NewId() + "@nowhere.com" o1.Type = model.TEAM_OPEN - <-store.Team().Save(&o1) + Must(store.Team().Save(&o1)) u1 := model.User{} u1.TeamId = o1.Id u1.Email = model.NewId() - <-store.User().Save(&u1) + Must(store.User().Save(&u1)) if r1 := <-store.Team().GetTeamsForEmail(u1.Email); r1.Err != nil { t.Fatal(r1.Err) -- cgit v1.2.3-1-g7c22