* Posts * Add missing translation * Fix internal store marshaling * [MM-22051] Remove To/From JSON (Channels) (#18116) * Channels * Channel members * ChannelSearch * Channel categories, list, sidebar, stats, view * Fix conversions * [MM-22051] Remove To/From JSON (Users) (#18121) * User related structs * Fix return * Team related structures (#18127) * [MM-22051] Remove To/From JSON (Status, Bot, Reaction, Thread, FileInfo) (#18130) * Status * Bot * Reaction * Thread * FileInfo * Some fixes * Translations update from Weblate (#18143) * Translated using Weblate (German) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2309 of 2309 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ Update translation files Updated by "Cleanup translation files" hook in Weblate. Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ * Translated using Weblate (German) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/de/ * Translated using Weblate (Turkish) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/tr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/hu/ * Translated using Weblate (English (Australia)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/en_AU/ * Translated using Weblate (Bulgarian) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/bg/ * Translated using Weblate (Japanese) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/ja/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 100.0% (2301 of 2301 strings) Translation: mattermost-languages-shipped/mattermost-server Translate-URL: https://translate.mattermost.com/projects/mattermost/mattermost-server_master/zh_Hans/ Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> * [MM-22051] Remove To/From JSON methods from model (#18138) * Scheme * Role * Session * Config * Status * Fix logic * Emoji * GuestsInvite * Group * Command * ClusterInfo * License * Job * System * Plugin * Command2 * IncomingWebhook * OutgoingWebhook * Fix tests * Update traslation * Some fixes * Add missing return * Simplify * Make Config.ToJSONFiltered() return []byte * Make Busy.ToJSON() return []byte * Include error in log * Split logic * [MM-22051] Remove To/From JSON (final) (#18150) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * [MM-23280] Fix linting for ToJSON/FromJSON (#18153) * SwitchRequest * PluginEventData * Permalink * PushNotification * SuggestCommand * PluginsResponse * WebSocketMessage * RemoteCluster * SharedChannel * PluginStatuses * InitialLoad * ClusterDiscovery * ClusterStats * MfaSecret * GroupSyncable * SAML * WebSocketRequest * TypingRequest * SecurityBulletin * OAuthApp * IntegrationAction * DataRetention * Preference * FileInfoList * Compliance * Preferences * FileInfoSearchResults * TermsOfService * InstallMarketplacePluginRequest * GitLabUser * UploadSessions * Remove unused helpers * Fix tests * Fix linting for ToJSON/FromJSON * Fix conversions Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: JtheBAB <srast@bioc.uzh.ch> Co-authored-by: Kaya Zeren <kayazeren@gmail.com> Co-authored-by: Tóth Csaba // Online ERP Hungary Kft <csaba.toth@online-erp.hu> Co-authored-by: Matthew Williams <Matthew.Williams@outlook.com.au> Co-authored-by: Nikolai Zahariev <nikolaiz@yahoo.com> Co-authored-by: kaakaa <stooner.hoe@gmail.com> Co-authored-by: aeomin <lin@aeomin.net> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
148 строки
4.9 KiB
Go
148 строки
4.9 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package app
|
|
|
|
import (
|
|
"encoding/json"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/einterfaces"
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
)
|
|
|
|
func TestBusySet(t *testing.T) {
|
|
cluster := &ClusterMock{Busy: &Busy{}}
|
|
busy := NewBusy(cluster)
|
|
|
|
isNotBusy := func() bool {
|
|
return !busy.IsBusy()
|
|
}
|
|
|
|
require.False(t, busy.IsBusy())
|
|
|
|
busy.Set(time.Millisecond * 100)
|
|
require.True(t, busy.IsBusy())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
// should automatically expire after 100ms.
|
|
require.Eventually(t, isNotBusy, time.Second*15, time.Millisecond*20)
|
|
// allow a moment for cluster to sync.
|
|
require.Eventually(t, func() bool { return compareBusyState(t, busy, cluster.Busy) }, time.Second*15, time.Millisecond*20)
|
|
|
|
// test set after auto expiry.
|
|
busy.Set(time.Second * 30)
|
|
require.True(t, busy.IsBusy())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
expire := busy.Expires()
|
|
require.Greater(t, expire.Unix(), time.Now().Add(time.Second*10).Unix())
|
|
|
|
// test extending existing expiry
|
|
busy.Set(time.Minute * 5)
|
|
require.True(t, busy.IsBusy())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
expire = busy.Expires()
|
|
require.Greater(t, expire.Unix(), time.Now().Add(time.Minute*2).Unix())
|
|
|
|
busy.Clear()
|
|
require.False(t, busy.IsBusy())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
}
|
|
|
|
func TestBusyExpires(t *testing.T) {
|
|
cluster := &ClusterMock{Busy: &Busy{}}
|
|
busy := NewBusy(cluster)
|
|
|
|
isNotBusy := func() bool {
|
|
return !busy.IsBusy()
|
|
}
|
|
|
|
// get expiry before it is set
|
|
expire := busy.Expires()
|
|
// should be time.Time zero value
|
|
require.Equal(t, time.Time{}.Unix(), expire.Unix())
|
|
|
|
// get expiry after it is set
|
|
busy.Set(time.Minute * 5)
|
|
expire = busy.Expires()
|
|
require.Greater(t, expire.Unix(), time.Now().Add(time.Minute*2).Unix())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
|
|
// get expiry after clear
|
|
busy.Clear()
|
|
expire = busy.Expires()
|
|
// should be time.Time zero value
|
|
require.Equal(t, time.Time{}.Unix(), expire.Unix())
|
|
require.True(t, compareBusyState(t, busy, cluster.Busy))
|
|
|
|
// get expiry after auto-expire
|
|
busy.Set(time.Millisecond * 100)
|
|
require.Eventually(t, isNotBusy, time.Second*5, time.Millisecond*20)
|
|
expire = busy.Expires()
|
|
// should be time.Time zero value
|
|
require.Equal(t, time.Time{}.Unix(), expire.Unix())
|
|
// allow a moment for cluster to sync
|
|
require.Eventually(t, func() bool { return compareBusyState(t, busy, cluster.Busy) }, time.Second*15, time.Millisecond*20)
|
|
}
|
|
|
|
func TestBusyRace(t *testing.T) {
|
|
cluster := &ClusterMock{Busy: &Busy{}}
|
|
busy := NewBusy(cluster)
|
|
|
|
busy.Set(500 * time.Millisecond)
|
|
|
|
// We are sleeping in order to let the race trigger.
|
|
time.Sleep(time.Second)
|
|
}
|
|
|
|
func compareBusyState(t *testing.T, busy1 *Busy, busy2 *Busy) bool {
|
|
t.Helper()
|
|
if busy1.IsBusy() != busy2.IsBusy() {
|
|
busy1JSON, _ := busy1.ToJSON()
|
|
busy2JSON, _ := busy2.ToJSON()
|
|
t.Logf("busy1:%s; busy2:%s\n", busy1JSON, busy2JSON)
|
|
return false
|
|
}
|
|
if busy1.Expires().Unix() != busy2.Expires().Unix() {
|
|
busy1JSON, _ := busy1.ToJSON()
|
|
busy2JSON, _ := busy2.ToJSON()
|
|
t.Logf("busy1:%s; busy2:%s\n", busy1JSON, busy2JSON)
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
// ClusterMock simulates the busy state of a cluster.
|
|
type ClusterMock struct {
|
|
Busy *Busy
|
|
}
|
|
|
|
func (c *ClusterMock) SendClusterMessage(msg *model.ClusterMessage) {
|
|
var sbs model.ServerBusyState
|
|
json.Unmarshal(msg.Data, &sbs)
|
|
c.Busy.ClusterEventChanged(&sbs)
|
|
}
|
|
|
|
func (c *ClusterMock) SendClusterMessageToNode(nodeID string, msg *model.ClusterMessage) error {
|
|
return nil
|
|
}
|
|
|
|
func (c *ClusterMock) StartInterNodeCommunication() {}
|
|
func (c *ClusterMock) StopInterNodeCommunication() {}
|
|
func (c *ClusterMock) RegisterClusterMessageHandler(event model.ClusterEvent, crm einterfaces.ClusterMessageHandler) {
|
|
}
|
|
func (c *ClusterMock) GetClusterId() string { return "cluster_mock" }
|
|
func (c *ClusterMock) IsLeader() bool { return false }
|
|
func (c *ClusterMock) GetMyClusterInfo() *model.ClusterInfo { return nil }
|
|
func (c *ClusterMock) GetClusterInfos() []*model.ClusterInfo { return nil }
|
|
func (c *ClusterMock) NotifyMsg(buf []byte) {}
|
|
func (c *ClusterMock) GetClusterStats() ([]*model.ClusterStats, *model.AppError) { return nil, nil }
|
|
func (c *ClusterMock) GetLogs(page, perPage int) ([]string, *model.AppError) { return nil, nil }
|
|
func (c *ClusterMock) GetPluginStatuses() (model.PluginStatuses, *model.AppError) { return nil, nil }
|
|
func (c *ClusterMock) ConfigChanged(previousConfig *model.Config, newConfig *model.Config, sendToOtherServer bool) *model.AppError {
|
|
return nil
|
|
}
|
|
func (c *ClusterMock) HealthScore() int { return 0 }
|