[MM-59350] Include LDAP vendor errors in Support Packet (#27571)

Этот коммит содержится в:
Ben Schumacher
2024-07-13 10:17:07 +02:00
коммит произвёл GitHub
родитель 9bb22a369a
Коммит bbc8baac0a
4 изменённых файлов: 55 добавлений и 7 удалений

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

@@ -9,6 +9,7 @@ import (
"testing"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"gopkg.in/yaml.v2"
@@ -16,6 +17,7 @@ import (
"github.com/mattermost/mattermost/server/v8/channels/app/platform"
smocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
"github.com/mattermost/mattermost/server/v8/config"
emocks "github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
fmocks "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks"
)
@@ -46,7 +48,7 @@ func TestGenerateSupportPacketYaml(t *testing.T) {
defer th.TearDown()
licenseUsers := 100
license := model.NewTestLicense()
license := model.NewTestLicense("ldap")
license.Features.Users = model.NewInt(licenseUsers)
th.App.Srv().SetLicense(license)
@@ -148,6 +150,34 @@ func TestGenerateSupportPacketYaml(t *testing.T) {
assert.Equal(t, "mock", packet.FileDriver)
assert.Equal(t, "FAIL: all broken", packet.FileStatus)
})
t.Run("no LDAP vendor info", func(t *testing.T) {
ldapMock := &emocks.LdapInterface{}
ldapMock.On(
"GetVendorNameAndVendorVersion",
mock.AnythingOfType("*request.Context"),
).Return("", "", nil)
th.App.Channels().Ldap = ldapMock
packet := generateSupportPacket(t)
assert.Equal(t, "unknown", packet.LdapVendorName)
assert.Equal(t, "unknown", packet.LdapVendorVersion)
})
t.Run("found LDAP vendor info", func(t *testing.T) {
ldapMock := &emocks.LdapInterface{}
ldapMock.On(
"GetVendorNameAndVendorVersion",
mock.AnythingOfType("*request.Context"),
).Return("some vendor", "v1.0.0", nil)
th.App.Channels().Ldap = ldapMock
packet := generateSupportPacket(t)
assert.Equal(t, "some vendor", packet.LdapVendorName)
assert.Equal(t, "v1.0.0", packet.LdapVendorVersion)
})
}
func TestGenerateSupportPacket(t *testing.T) {