diff options
| author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-03-21 14:27:14 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-21 18:27:14 +0000 |
| commit | 9d701c704416a1d8648dd2818a8a15c4da99b424 (patch) | |
| tree | 8ad361400a4435c96b9a82eff96fad8508ad9df8 /app/import_test.go | |
| parent | b1b23079c6a49df29b6f27b85e98d6a9b1d3607c (diff) | |
| download | chat-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 'app/import_test.go')
| -rw-r--r-- | app/import_test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/import_test.go b/app/import_test.go index 6a284f63d..f294c8731 100644 --- a/app/import_test.go +++ b/app/import_test.go @@ -4,6 +4,7 @@ package app import ( + "path/filepath" "runtime/debug" "strings" "testing" @@ -370,7 +371,7 @@ func TestImportValidateUserImportData(t *testing.T) { // Test a valid User with all fields populated. testsDir, _ := utils.FindDir("tests") data = UserImportData{ - ProfileImage: ptrStr(testsDir + "test.png"), + ProfileImage: ptrStr(filepath.Join(testsDir, "test.png")), Username: ptrStr("bob"), Email: ptrStr("bob@example.com"), AuthService: ptrStr("ldap"), @@ -1487,7 +1488,7 @@ func TestImportImportUser(t *testing.T) { username := model.NewId() testsDir, _ := utils.FindDir("tests") data = UserImportData{ - ProfileImage: ptrStr(testsDir + "test.png"), + ProfileImage: ptrStr(filepath.Join(testsDir, "test.png")), Username: &username, Email: ptrStr(model.NewId() + "@example.com"), Nickname: ptrStr(model.NewId()), @@ -1543,7 +1544,7 @@ func TestImportImportUser(t *testing.T) { // Alter all the fields of that user. data.Email = ptrStr(model.NewId() + "@example.com") - data.ProfileImage = ptrStr(testsDir + "testgif.gif") + data.ProfileImage = ptrStr(filepath.Join(testsDir, "testgif.gif")) data.AuthService = ptrStr("ldap") data.AuthData = &username data.Nickname = ptrStr(model.NewId()) |