summaryrefslogtreecommitdiffstats
path: root/api4
diff options
context:
space:
mode:
authorJesse Hallam <jesse.hallam@gmail.com>2018-03-21 14:27:14 -0400
committerGeorge Goldberg <george@gberg.me>2018-03-21 18:27:14 +0000
commit9d701c704416a1d8648dd2818a8a15c4da99b424 (patch)
tree8ad361400a4435c96b9a82eff96fad8508ad9df8 /api4
parentb1b23079c6a49df29b6f27b85e98d6a9b1d3607c (diff)
downloadchat-9d701c704416a1d8648dd2818a8a15c4da99b424.tar.gz
chat-9d701c704416a1d8648dd2818a8a15c4da99b424.tar.bz2
chat-9d701c704416a1d8648dd2818a8a15c4da99b424.zip
Fix various segfaults when running `go test` manually (#8448)
* failing to find i18n shouldn't segfault The server was trying to handle the fact that it couldn't find the i18n directory, by emitting a translated log message... * fix utils.FindDir The attempts to find the directory in the parent or grandparent directory don't work if the current working directory was inside `enterprise`, with `enterprise` itself being a symlink as per the usual developer setup. Recurse to the root of the filesystem, cleaning the path along the way to work around this limitation (and allow tests to be run from an arbitrarily deep nesting level.) Fix corresponding usages to employ filepath.Join. * failing to find html templates shouldn't segfault * fail fast if the test user cannot be created * rework utils.FindDir to retain backwards compatibility
Diffstat (limited to 'api4')
-rw-r--r--api4/apitestlib.go9
-rw-r--r--api4/oauth.go3
-rw-r--r--api4/plugin_test.go3
3 files changed, 11 insertions, 4 deletions
diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 6edd37812..386afdadd 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -11,6 +11,7 @@ import (
"net"
"net/http"
"os"
+ "path/filepath"
"reflect"
"strconv"
"strings"
@@ -302,7 +303,11 @@ func (me *TestHelper) CreateUserWithClient(client *model.Client4) *model.User {
}
utils.DisableDebugLogForTest()
- ruser, _ := client.CreateUser(user)
+ ruser, response := client.CreateUser(user)
+ if response.Error != nil {
+ panic(response.Error)
+ }
+
ruser.Password = "Password1"
store.Must(me.App.Srv.Store.User().VerifyEmail(ruser.Id))
utils.EnableDebugLogForTest()
@@ -675,7 +680,7 @@ func CheckInternalErrorStatus(t *testing.T, resp *model.Response) {
func readTestFile(name string) ([]byte, error) {
path, _ := utils.FindDir("tests")
- file, err := os.Open(path + "/" + name)
+ file, err := os.Open(filepath.Join(path, name))
if err != nil {
return nil, err
}
diff --git a/api4/oauth.go b/api4/oauth.go
index d0f43256a..a173159b6 100644
--- a/api4/oauth.go
+++ b/api4/oauth.go
@@ -6,6 +6,7 @@ package api4
import (
"net/http"
"net/url"
+ "path/filepath"
"strings"
l4g "github.com/alecthomas/log4go"
@@ -375,7 +376,7 @@ func authorizeOAuthPage(c *Context, w http.ResponseWriter, r *http.Request) {
w.Header().Set("Cache-Control", "no-cache, max-age=31556926, public")
staticDir, _ := utils.FindDir(model.CLIENT_DIR)
- http.ServeFile(w, r, staticDir+"root.html")
+ http.ServeFile(w, r, filepath.Join(staticDir, "root.html"))
}
func getAccessToken(c *Context, w http.ResponseWriter, r *http.Request) {
diff --git a/api4/plugin_test.go b/api4/plugin_test.go
index e385b5c8c..045ae9212 100644
--- a/api4/plugin_test.go
+++ b/api4/plugin_test.go
@@ -8,6 +8,7 @@ import (
"encoding/json"
"io/ioutil"
"os"
+ "path/filepath"
"testing"
"github.com/mattermost/mattermost-server/model"
@@ -53,7 +54,7 @@ func TestPlugin(t *testing.T) {
}()
path, _ := utils.FindDir("tests")
- file, err := os.Open(path + "/testplugin.tar.gz")
+ file, err := os.Open(filepath.Join(path, "testplugin.tar.gz"))
if err != nil {
t.Fatal(err)
}