upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge 740c98a31b into cfafefe58c

Browse source
This commit is contained in:
Pavel Zeman 2026-05-25 10:10:22 +00:00 committed by GitHub
commit 9c3c4b4222
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
server/channels/app/plugin_hooks_test.go
View file

@ -937,10 +937,11 @@ func TestUserHasBeenDeactivated(t *testing.T) {
_, err = th.App.UpdateActive(th.Context, user, false)
require.Nil(t, err)
time.Sleep(2 * time.Second)
user, err = th.App.GetUser(user.Id)
require.Nil(t, err)
require.Equal(t, "plugin-callback-success", user.Nickname)
require.Eventually(t, func() bool {
user, err = th.App.GetUser(user.Id)
require.Nil(t, err)
return user.Nickname == "plugin-callback-success"
}, 10*time.Second, 100*time.Millisecond)
}
func TestUserHasBeenCreated(t *testing.T) {
@ -982,10 +983,11 @@ func TestUserHasBeenCreated(t *testing.T) {
_, err := th.App.CreateUser(th.Context, user)
require.Nil(t, err)
time.Sleep(2 * time.Second)
user, err = th.App.GetUser(user.Id)
require.Nil(t, err)
require.Equal(t, "plugin-callback-success", user.Nickname)
require.Eventually(t, func() bool {
user, err = th.App.GetUser(user.Id)
require.Nil(t, err)
return user.Nickname == "plugin-callback-success"
}, 10*time.Second, 100*time.Millisecond)
}
func TestErrorString(t *testing.T) {
@ -1168,10 +1170,11 @@ func TestActiveHooks(t *testing.T) {
}
_, appErr := th.App.CreateUser(th.Context, user1)
require.Nil(t, appErr)
time.Sleep(2 * time.Second)
user1, appErr = th.App.GetUser(user1.Id)
require.Nil(t, appErr)
require.Equal(t, "plugin-callback-success", user1.Nickname)
require.Eventually(t, func() bool {
user1, appErr = th.App.GetUser(user1.Id)
require.Nil(t, appErr)
return user1.Nickname == "plugin-callback-success"
}, 10*time.Second, 100*time.Millisecond)
// Disable plugin
require.True(t, th.App.GetPluginsEnvironment().Deactivate(pluginID))
@ -1274,10 +1277,11 @@ func TestHookMetrics(t *testing.T) {
}
_, appErr := th.App.CreateUser(th.Context, user1)
require.Nil(t, appErr)
time.Sleep(2 * time.Second)
user1, appErr = th.App.GetUser(user1.Id)
require.Nil(t, appErr)
require.Equal(t, "plugin-callback-success", user1.Nickname)
require.Eventually(t, func() bool {
user1, appErr = th.App.GetUser(user1.Id)
require.Nil(t, appErr)
return user1.Nickname == "plugin-callback-success"
}, 10*time.Second, 100*time.Millisecond)
// Disable plugin
require.True(t, th.App.GetPluginsEnvironment().Deactivate(pluginID))
@ -1620,10 +1624,10 @@ func TestHookNotificationWillBePushed(t *testing.T) {
}
wg.Wait()
// Hack to let the worker goroutines complete.
time.Sleep(2 * time.Second)
// Server side verification.
assert.Equal(t, tt.expectedNotifications, handler.numReqs())
// Wait for the worker goroutines to complete.
require.Eventually(t, func() bool {
return handler.numReqs() == tt.expectedNotifications
}, 10*time.Second, 100*time.Millisecond)
var numMessages int
for _, n := range handler.notifications() {
switch n.Type {