diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-23 11:06:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-23 11:06:25 -0400 |
commit | 5c1049054eace710abd3418bbad141fbb7dd5d7f (patch) | |
tree | 24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /api | |
parent | 69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff) | |
download | chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2 chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip |
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded
* Print usage messages when errors occur during CLI initialization
* Reverted behaviour of FindDir and added second return value to it
* Fixed merge conflict
Diffstat (limited to 'api')
-rw-r--r-- | api/file_test.go | 2 | ||||
-rw-r--r-- | api/user_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/file_test.go b/api/file_test.go index 40534d724..59adc8a71 100644 --- a/api/file_test.go +++ b/api/file_test.go @@ -805,7 +805,7 @@ func TestGetInfoForFilename(t *testing.T) { } func readTestFile(name string) ([]byte, error) { - path := utils.FindDir("tests") + path, _ := utils.FindDir("tests") file, err := os.Open(path + "/" + name) if err != nil { return nil, err diff --git a/api/user_test.go b/api/user_test.go index d9234d356..484cf6495 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -747,7 +747,7 @@ func TestUserUploadProfileImage(t *testing.T) { t.Fatal(err) } - path := utils.FindDir("tests") + path, _ := utils.FindDir("tests") file, err := os.Open(path + "/test.png") if err != nil { t.Fatal(err) |