From 5c1049054eace710abd3418bbad141fbb7dd5d7f Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 23 May 2017 11:06:25 -0400 Subject: 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 --- api/file_test.go | 2 +- api/user_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'api') 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) -- cgit v1.2.3-1-g7c22