Skip to content

Commit

Permalink
Fixed errcheck issues in server/channels/app/export_test.go (mattermo…
Browse files Browse the repository at this point in the history 
…st#29004)

Co-authored-by: Ben Schumacher <[email protected]>
  • Loading branch information
@Aryakoste @hanzei
Aryakoste and hanzei authored Dec 17, 2024
1 parent faa7e4f commit cf93d2a
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 25 deletions.
1 change: 0 additions & 1 deletion server/.golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ issues:
channels/app/brand.go|\
channels/app/config_test.go|\
channels/app/export.go|\
channels/app/export_test.go|\
channels/app/file.go|\
channels/app/file_bench_test.go|\
channels/app/file_test.go|\
Expand Down
62 changes: 38 additions & 24 deletions server/channels/app/export_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,8 @@ func TestExportUserChannels(t *testing.T) {
err := th.App.Srv().Store().Preference().Save(preferences)
require.NoError(t, err)

th.App.UpdateChannelMemberNotifyProps(th.Context, notifyProps, channel.Id, user.Id)
_, appErr = th.App.UpdateChannelMemberNotifyProps(th.Context, notifyProps, channel.Id, user.Id)
require.Nil(t, appErr)
exportData, appErr := th.App.buildUserChannelMemberships(th.Context, user.Id, team.Id, false)
require.Nil(t, appErr)
assert.Equal(t, len(*exportData), 3)
Expand Down Expand Up @@ -141,19 +142,22 @@ func TestCopyEmojiImages(t *testing.T) {
// Creating a dir named `exported_emoji_test` in the root of the repo
pathToDir := "../exported_emoji_test"

os.Mkdir(pathToDir, 0777)
err := os.Mkdir(pathToDir, 0777)
require.NoError(t, err)
defer os.RemoveAll(pathToDir)

filePath := "../data/emoji/" + emoji.Id
emojiImagePath := filePath + "/image"

var _, err = os.Stat(filePath)
_, err = os.Stat(filePath)
if os.IsNotExist(err) {
os.MkdirAll(filePath, 0777)
err = os.MkdirAll(filePath, 0777)
require.NoError(t, err)
}

// Creating a file with the name `image` to copy it to `exported_emoji_test`
os.OpenFile(filePath+"/image", os.O_RDONLY|os.O_CREATE, 0777)
_, err = os.OpenFile(filePath+"/image", os.O_RDONLY|os.O_CREATE, 0777)
require.NoError(t, err)
defer os.RemoveAll(filePath)

copyError := th.App.copyEmojiImages(emoji.Id, emojiImagePath, pathToDir)
Expand Down Expand Up @@ -275,18 +279,19 @@ func TestExportDMChannel(t *testing.T) {
// DM Channel
ch := th1.CreateDmChannel(th1.BasicUser2)

th1.App.Srv().Store().Preference().Save(model.Preferences{
err := th1.App.Srv().Store().Preference().Save(model.Preferences{
{
UserId: th1.BasicUser2.Id,
Category: model.PreferenceCategoryFavoriteChannel,
Name: ch.Id,
Value: "true",
},
})
require.NoError(t, err)

var b bytes.Buffer
err := th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, err)
appErr := th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, appErr)

channels, nErr := th1.App.Srv().Store().Channel().GetAllDirectChannelsForExportAfter(1000, "00000000", false)
require.NoError(t, nErr)
Expand All @@ -300,8 +305,9 @@ func TestExportDMChannel(t *testing.T) {
assert.Equal(t, 0, len(channels))

// import the exported channel
err, i := th2.App.BulkImport(th2.Context, &b, nil, false, 5)
require.Nil(t, err)
var i int
appErr, i = th2.App.BulkImport(th2.Context, &b, nil, false, 5)
require.Nil(t, appErr)
assert.Equal(t, 0, i)

// Ensure the Members of the imported DM channel is the same was from the exported
Expand Down Expand Up @@ -329,19 +335,21 @@ func TestExportDMChannel(t *testing.T) {
require.NoError(t, nErr)
assert.Equal(t, 1, len(channels))

th1.App.PermanentDeleteUser(th1.Context, th1.BasicUser2)
th1.App.PermanentDeleteUser(th1.Context, th1.BasicUser)
appErr := th1.App.PermanentDeleteUser(th1.Context, th1.BasicUser2)
require.Nil(t, appErr)
appErr = th1.App.PermanentDeleteUser(th1.Context, th1.BasicUser)
require.Nil(t, appErr)

var b bytes.Buffer
err := th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, err)
appErr = th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, appErr)

th2 := Setup(t).InitBasic()
defer th2.TearDown()

// import the exported channel
err, _ = th2.App.BulkImport(th2.Context, &b, nil, true, 5)
require.Nil(t, err)
appErr, _ = th2.App.BulkImport(th2.Context, &b, nil, true, 5)
require.Nil(t, appErr)

channels, nErr = th2.App.Srv().Store().Channel().GetAllDirectChannelsForExportAfter(1000, "00000000", false)
require.NoError(t, nErr)
Expand Down Expand Up @@ -481,36 +489,40 @@ func TestExportDMandGMPost(t *testing.T) {
Message: "aa" + model.NewId() + "a",
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p1, dmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr := th1.App.CreatePost(th1.Context, p1, dmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

p2 := &model.Post{
ChannelId: dmChannel.Id,
Message: "bb" + model.NewId() + "a",
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p2, dmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr = th1.App.CreatePost(th1.Context, p2, dmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

// GM posts
p3 := &model.Post{
ChannelId: gmChannel.Id,
Message: "cc" + model.NewId() + "a",
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p3, gmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr = th1.App.CreatePost(th1.Context, p3, gmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

p4 := &model.Post{
ChannelId: gmChannel.Id,
Message: "dd" + model.NewId() + "a",
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p4, gmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr = th1.App.CreatePost(th1.Context, p4, gmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

posts, err := th1.App.Srv().Store().Post().GetDirectPostParentsForExportAfter(1000, "0000000", false)
require.NoError(t, err)
assert.Equal(t, 4, len(posts))

var b bytes.Buffer
appErr := th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
appErr = th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, appErr)

th1.TearDown()
Expand Down Expand Up @@ -566,7 +578,8 @@ func TestExportPostWithProps(t *testing.T) {
},
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p1, dmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr := th1.App.CreatePost(th1.Context, p1, dmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

p2 := &model.Post{
ChannelId: gmChannel.Id,
Expand All @@ -576,7 +589,8 @@ func TestExportPostWithProps(t *testing.T) {
},
UserId: th1.BasicUser.Id,
}
th1.App.CreatePost(th1.Context, p2, gmChannel, model.CreatePostFlags{SetOnline: true})
_, appErr = th1.App.CreatePost(th1.Context, p2, gmChannel, model.CreatePostFlags{SetOnline: true})
require.Nil(t, appErr)

posts, err := th1.App.Srv().Store().Post().GetDirectPostParentsForExportAfter(1000, "0000000", false)
require.NoError(t, err)
Expand All @@ -585,7 +599,7 @@ func TestExportPostWithProps(t *testing.T) {
require.NotEmpty(t, posts[1].Props)

var b bytes.Buffer
appErr := th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
appErr = th1.App.BulkExport(th1.Context, &b, "somePath", nil, model.BulkExportOpts{})
require.Nil(t, appErr)

th1.TearDown()
Expand Down

0 comments on commit cf93d2a

Please sign in to comment.