Fixed some ineffective assignments (#12543)

Этот коммит содержится в:
Agniva De Sarker
2019-10-03 18:15:27 +05:30
коммит произвёл Eli Yukelzon
родитель eebe1fc290
Коммит 20ff7032a6
16 изменённых файлов: 35 добавлений и 11 удалений

Просмотреть файл

@@ -40,11 +40,11 @@ func testAuditStore(t *testing.T, ss store.Store) {
assert.Equal(t, "extra", audits[0].ExtraInfo)
audits, err = ss.Audit().Get("missing", 0, 100)
require.Nil(t, err)
assert.Len(t, audits, 0)
audits, err = ss.Audit().Get("", 0, 100)
require.Nil(t, err)
if len(audits) < 4 {
t.Fatal("Failed to save and retrieve 4 audit logs")
}
@@ -65,12 +65,14 @@ func testAuditStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
require.Nil(t, ss.Audit().Save(a3))
audits, err := ss.Audit().Get(a1.UserId, 0, 100)
require.Nil(t, err)
assert.Len(t, audits, 3)
_, err = ss.Audit().PermanentDeleteBatch(cutoff, 1000000)
require.Nil(t, err)
audits, err = ss.Audit().Get(a1.UserId, 0, 100)
require.Nil(t, err)
assert.Len(t, audits, 1)
require.Nil(t, ss.Audit().PermanentDeleteByUser(a1.UserId))

Просмотреть файл

@@ -3349,6 +3349,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) {
Message: "test",
IsPinned: true,
})
require.Nil(t, err)
if pl, errGet := ss.Channel().GetPinnedPosts(o1.Id); errGet != nil {
t.Fatal(errGet)

Просмотреть файл

@@ -1761,6 +1761,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
if tc.TotalCount != nil {
var count int64
count, err = ss.Group().CountGroupsByChannel(tc.ChannelId, tc.Opts)
require.Nil(t, err)
require.Equal(t, *tc.TotalCount, count)
}
})
@@ -1975,6 +1976,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
if tc.TotalCount != nil {
var count int64
count, err = ss.Group().CountGroupsByTeam(tc.TeamId, tc.Opts)
require.Nil(t, err)
require.Equal(t, *tc.TotalCount, count)
}
})

Просмотреть файл

@@ -1735,6 +1735,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
UserId: model.NewId(),
}
_, err = ss.Bot().Save(bot1)
require.Nil(t, err)
b1 := &model.Post{}
b1.Message = "bot message one"
@@ -2118,6 +2119,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
o1.UserId = model.NewId()
o1.Message = "zz" + model.NewId() + "b"
o1, err := ss.Post().Save(o1)
require.Nil(t, err)
time.Sleep(2 * time.Millisecond)
o2 := &model.Post{}
@@ -2135,6 +2137,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
o3.Message = "zz" + model.NewId() + "b"
o3.DeleteAt = 1
o3, err = ss.Post().Save(o3)
require.Nil(t, err)
time.Sleep(2 * time.Millisecond)
o4 := &model.Post{}
@@ -2280,6 +2283,7 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) {
o3.UserId = model.NewId()
o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
o3, err = ss.Post().Save(o3)
require.Nil(t, err)
r1, err := ss.Post().Get(o1.Id, false)
if err != nil {
@@ -2489,6 +2493,7 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) {
o3.RootId = o1.Id
o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ"
o3, err = ss.Post().Save(o3)
require.Nil(t, err)
if r, err := ss.Post().GetPostsBatchForIndexing(o1.CreateAt, model.GetMillis()+100000, 100); err != nil {
t.Fatal(err)

Просмотреть файл

@@ -745,7 +745,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
assert.Nil(t, err)
assert.Equal(t, []*model.Team{t1, t3, t5}, teams)
teams, err = ss.Team().GetAllPublicTeamPageListing(1, 1)
_, err = ss.Team().GetAllPublicTeamPageListing(1, 1)
assert.Nil(t, err)
}

Просмотреть файл

@@ -3489,18 +3489,22 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlSuppli
// Daily counts (without bots)
count, err := ss.User().AnalyticsActiveCount(DAY_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: false})
require.Nil(t, err)
assert.Equal(t, int64(2), count)
// Daily counts (with bots)
count, err = ss.User().AnalyticsActiveCount(DAY_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: true})
require.Nil(t, err)
assert.Equal(t, int64(3), count)
// Monthly counts (without bots)
count, err = ss.User().AnalyticsActiveCount(MONTH_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: false})
require.Nil(t, err)
assert.Equal(t, int64(3), count)
// Monthly counts - (with bots)
count, err = ss.User().AnalyticsActiveCount(MONTH_MILLISECONDS, model.UserCountOptions{IncludeBotAccounts: true})
require.Nil(t, err)
assert.Equal(t, int64(4), count)
}
@@ -4878,6 +4882,7 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) {
u1 := &model.User{}
u1.Email = MakeEmail()
_, err := ss.User().Save(u1)
require.Nil(t, err)
defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }()
_, err = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1)
require.Nil(t, err)