diff options
author | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:27 -0600 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2016-01-20 13:36:27 -0600 |
commit | d703d09063538fb91baa5a21b1001216c43d848a (patch) | |
tree | d87809ff2a306e5428b0ab6973d05509baa21abd /manualtesting/manual_testing.go | |
parent | 0b1aff3b24b4ac2df8e963c83d6e52b127c603f9 (diff) | |
parent | aefbb541d0d5bdd9919fef44fbf1a1fbfeaeb58b (diff) | |
download | chat-d703d09063538fb91baa5a21b1001216c43d848a.tar.gz chat-d703d09063538fb91baa5a21b1001216c43d848a.tar.bz2 chat-d703d09063538fb91baa5a21b1001216c43d848a.zip |
Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-db
Revert " PLT-7 adding loc for db calls"
Diffstat (limited to 'manualtesting/manual_testing.go')
-rw-r--r-- | manualtesting/manual_testing.go | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/manualtesting/manual_testing.go b/manualtesting/manual_testing.go index b9549690e..befc835fb 100644 --- a/manualtesting/manual_testing.go +++ b/manualtesting/manual_testing.go @@ -4,18 +4,16 @@ package manualtesting import ( + l4g "github.com/alecthomas/log4go" + "github.com/mattermost/platform/api" + "github.com/mattermost/platform/model" + "github.com/mattermost/platform/utils" "hash/fnv" "math/rand" "net/http" "net/url" "strconv" "time" - - l4g "github.com/alecthomas/log4go" - "github.com/mattermost/platform/api" - "github.com/mattermost/platform/model" - "github.com/mattermost/platform/utils" - goi18n "github.com/nicksnyder/go-i18n/i18n" ) type TestEnvironment struct { @@ -72,7 +70,7 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) { Type: model.TEAM_OPEN, } - if result := <-api.Srv.Store.Team().Save(c.T, team); result.Err != nil { + if result := <-api.Srv.Store.Team().Save(team); result.Err != nil { c.Err = result.Err return } else { @@ -100,7 +98,7 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) { c.Err = err return } - api.Srv.Store.User().VerifyEmail(c.T, result.Data.(*model.User).Id) + api.Srv.Store.User().VerifyEmail(result.Data.(*model.User).Id) newuser := result.Data.(*model.User) userID = newuser.Id @@ -151,9 +149,9 @@ func manualTest(c *api.Context, w http.ResponseWriter, r *http.Request) { } } -func getChannelID(T goi18n.TranslateFunc, channelname string, teamid string, userid string) (id string, err bool) { +func getChannelID(channelname string, teamid string, userid string) (id string, err bool) { // Grab all the channels - result := <-api.Srv.Store.Channel().GetChannels(T, teamid, userid) + result := <-api.Srv.Store.Channel().GetChannels(teamid, userid) if result.Err != nil { l4g.Debug("Unable to get channels") return "", false |