IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-52088] Fix flaky draft tests (#24405)

Browse Source
This commit is contained in:
Ben Schumacher 2023-08-30 12:52:37 +02:00 committed by GitHub
parent 5de1e306de
commit 983a965cb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server/channels/api4/drafts_test.go
View File

@ -7,6 +7,7 @@ import (
"context" "context"
"os" "os"
"testing" "testing"
"time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -85,7 +86,6 @@ func TestUpsertDraft(t *testing.T) {
} }
func TestGetDrafts(t *testing.T) { func TestGetDrafts(t *testing.T) {
t.Skip("MM-53452")
os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true") os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true")
defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS") defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS")
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true") os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true")
@ -104,7 +104,6 @@ func TestGetDrafts(t *testing.T) {
draft1 := &model.Draft{ draft1 := &model.Draft{
CreateAt: 00001, CreateAt: 00001,
UpdateAt: 00001,
UserId: user.Id, UserId: user.Id,
ChannelId: channel1.Id, ChannelId: channel1.Id,
Message: "draft1", Message: "draft1",
@ -112,7 +111,6 @@ func TestGetDrafts(t *testing.T) {
draft2 := &model.Draft{ draft2 := &model.Draft{
CreateAt: 11111, CreateAt: 11111,
UpdateAt: 32222,
UserId: user.Id, UserId: user.Id,
ChannelId: channel2.Id, ChannelId: channel2.Id,
Message: "draft2", Message: "draft2",
@ -124,6 +122,9 @@ func TestGetDrafts(t *testing.T) {
_, _, err := client.UpsertDraft(context.Background(), draft1) _, _, err := client.UpsertDraft(context.Background(), draft1)
require.NoError(t, err) require.NoError(t, err)
// Wait a bit so the second draft gets a newer UpdateAt
time.Sleep(100 * time.Millisecond)
// upsert draft2 // upsert draft2
_, _, err = client.UpsertDraft(context.Background(), draft2) _, _, err = client.UpsertDraft(context.Background(), draft2)
require.NoError(t, err) require.NoError(t, err)
@ -157,7 +158,6 @@ func TestGetDrafts(t *testing.T) {
} }
func TestDeleteDraft(t *testing.T) { func TestDeleteDraft(t *testing.T) {
t.Skip("MM-53452")
os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true") os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true")
defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS") defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS")
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true") os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true")
@ -176,7 +176,6 @@ func TestDeleteDraft(t *testing.T) {
draft1 := &model.Draft{ draft1 := &model.Draft{
CreateAt: 00001, CreateAt: 00001,
UpdateAt: 00001,
UserId: user.Id, UserId: user.Id,
ChannelId: channel1.Id, ChannelId: channel1.Id,
Message: "draft1", Message: "draft1",
@ -185,7 +184,6 @@ func TestDeleteDraft(t *testing.T) {
draft2 := &model.Draft{ draft2 := &model.Draft{
CreateAt: 11111, CreateAt: 11111,
UpdateAt: 32222,
UserId: user.Id, UserId: user.Id,
ChannelId: channel2.Id, ChannelId: channel2.Id,
Message: "draft2", Message: "draft2",
@ -196,6 +194,9 @@ func TestDeleteDraft(t *testing.T) {
_, _, err := client.UpsertDraft(context.Background(), draft1) _, _, err := client.UpsertDraft(context.Background(), draft1)
require.NoError(t, err) require.NoError(t, err)
// Wait a bit so the second draft gets a newer UpdateAt
time.Sleep(100 * time.Millisecond)
// upsert draft2 // upsert draft2
_, _, err = client.UpsertDraft(context.Background(), draft2) _, _, err = client.UpsertDraft(context.Background(), draft2)
require.NoError(t, err) require.NoError(t, err)

7
server/channels/app/draft_test.go
View File

@ -6,6 +6,7 @@ package app
import ( import (
"os" "os"
"testing" "testing"
"time"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
@ -246,7 +247,6 @@ func TestGetDraftsForUser(t *testing.T) {
draft1 := &model.Draft{ draft1 := &model.Draft{
CreateAt: 00001, CreateAt: 00001,
UpdateAt: 00001,
UserId: user.Id, UserId: user.Id,
ChannelId: channel.Id, ChannelId: channel.Id,
Message: "draft1", Message: "draft1",
@ -254,7 +254,6 @@ func TestGetDraftsForUser(t *testing.T) {
draft2 := &model.Draft{ draft2 := &model.Draft{
CreateAt: 00005, CreateAt: 00005,
UpdateAt: 00005,
UserId: user.Id, UserId: user.Id,
ChannelId: channel2.Id, ChannelId: channel2.Id,
Message: "draft2", Message: "draft2",
@ -263,11 +262,13 @@ func TestGetDraftsForUser(t *testing.T) {
_, createDraftErr1 := th.App.UpsertDraft(th.Context, draft1, "") _, createDraftErr1 := th.App.UpsertDraft(th.Context, draft1, "")
assert.Nil(t, createDraftErr1) assert.Nil(t, createDraftErr1)
// Wait a bit so the second draft gets a newer UpdateAt
time.Sleep(100 * time.Millisecond)
_, createDraftErr2 := th.App.UpsertDraft(th.Context, draft2, "") _, createDraftErr2 := th.App.UpsertDraft(th.Context, draft2, "")
assert.Nil(t, createDraftErr2) assert.Nil(t, createDraftErr2)
t.Run("get drafts", func(t *testing.T) { t.Run("get drafts", func(t *testing.T) {
t.Skip("MM-52088")
draftResp, err := th.App.GetDraftsForUser(user.Id, th.BasicTeam.Id) draftResp, err := th.App.GetDraftsForUser(user.Id, th.BasicTeam.Id)
assert.Nil(t, err) assert.Nil(t, err)