mirror of
https://github.com/hanzoai/team.git
synced 2026-09-30 01:57:35 +00:00
* ci: shard server Postgres tests into 4 parallel runners (#35739) Cherry-pick of00296f9b49from master. * updated go to version 1.25.8 (#35817) Cherry-pick of32a10bac62from master. * Move password hashers from server/v8 to server/public (#35805) Cherry-pick ofcca3f08574from master. * Generate instead of hard-coding test passwords, enforce new minimum for FIPS, shard CI, fix FIPS builds (#35905) Cherry-pick of1bdd985b41from master. * upgrade golangci-lint (#35845) Cherry-pick of157e0400b2from master. On release-11.4 (unlike 11.5), UpdatePostsChannelTypeByChannelId and BackfillPostsChannelType exist in the elasticsearch/opensearch files, so the imports they require (fmt, updatebyquery, scriptlanguage) must be added — they were not in the cherry-pick diff since they already existed on master. Also updates html2text/tablewriter/olekukonko deps to fix a workspace conflict where enterprise's Go 1.25.8 bump pulled in a newer html2text that requires tablewriter ≥ 1.1 (was pinned to 0.0.5 via a replace directive). Matches the subset of866f759e4b(Mm 66662 bump deps) relevant to this incompatibility. * Fix FIPS-incompatible passwords and config in e2e test suites (#36001) Cherry-pick ofb51b4a8937from master. release-11.4 differences vs release-11.5: - demo_plugin_installation.spec.ts also deleted (modify/delete conflict, git rm) - authentication_2_spec.ts conflict: HEAD missing check() call; took incoming (check + FIPS-length passwords) - member_invitation_ui_spec.ts: HEAD has 'Create Account' (capital A) matching release-11.4 button text; kept HEAD's button text with incoming's newTestPassword() * fix(cypress): demo plugin (#36056) Cherry-pick of39f1979aa5from master. demo_plugin_installation.spec.ts was deleted in step 10 (modify/delete); re-created here with both the FIPS-password change and the URL fix. * test: clean up channel store data after TestChannelStore (#36066) TestChannelStore sub-tests create channels, members, and team members using fake TeamIds and UserIds (model.NewId() for non-existent rows). These records are left in the database and cause integrity tests (TestCheck*) running in the same binary to fail their full-table scans. Register a t.Cleanup on TestChannelStore that purges the affected tables entirely. A blanket purge is safe: the schema enforces no FK constraints, and every test suite creates its own data independently. * Fix command injection in server-test-template workflow (#36080) Cherry-pick of9223935f16from master. * fix(ci): restore testname format in sharded gotestsum runs (#36078) run-shard-tests.sh called gotestsum directly without --format, so it fell back to gotestsum's default (pkgname) instead of the testname format set by the Makefile. Pass --format "${GOTESTSUM_FORMAT:-testname}" to match the Makefile default. Co-authored-by: Mattermost Build <[email protected]> * fixup: drop demo_plugin playwright specs — master-only APIs demo_plugin/helpers.ts and demo_plugin_installation.spec.ts use installAndEnablePlugin and isPluginActive which don't exist on release-11.4's PlaywrightExtended type. These files were re-created by the step-11 cherry-pick of39f1979aa5, but they don't compile on this branch (same class of problem as actions.spec.ts in step 10). * fixup: add missing await in PluginLinkTooltip test The test added in39f1979aa5is missing an await on renderWithContext, causing the pointer-events assertion to race. Fix from 0c7d3f27c6 (on a feature branch, not yet on master). * fixup: drop pointer-events test incompatible with jsdom@20 The 'should not block interaction with elements outside the tooltip' test checks getComputedStyle for pointer-events: none, which is set only in SCSS. release-11.4 uses jest-environment-jsdom@29 (jsdom@20), which does not apply stylesheets, so getComputedStyle always returns "". The test passes on release-11.5+ only because they use jest-environment-jsdom@30 (jsdom@25+). Drop the test rather than backport the jsdom upgrade. * fixup: add missing i18n keys for elasticsearch/opensearch functions BackfillPostsChannelType and UpdatePostsChannelTypeByChannelId exist on release-11.4 (unlike release-11.5+). The golangci-lint cherry-pick added new error strings to those functions referencing i18n keys that weren't in en.json. * fixup: run make i18n-extract to reorder keys correctly * fixup: drop terms-and-privacy checkbox from MM-T1774 on release-11.4 The #signup-body-card-form-check-terms-and-privacy element did not exist on release-11.4's signup page. It was added to master after this branch was cut, so the check() call from the incoming cherry-pick causes the test to fail with "element never found". * fixup: remove UpdatePostsChannelTypeByChannelId/BackfillPostsChannelType These functions were introduced by MM-67540 (allow searching public channel messages without channel membership), which never landed on release-11.4. The golangci-lint cherry-pick only modernizes existing code; the rerere resolution incorrectly added the full function bodies from master. Remove both functions and their now-unused imports (fmt, updatebyquery, scriptlanguage) from elasticsearch.go and opensearch.go. Also remove the two i18n keys added to support them. Same treatment as release-11.5, where these functions were also absent. --------- Co-authored-by: Mattermost Build <[email protected]>
194 lines
5.3 KiB
Go
194 lines
5.3 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package commands
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"flag"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/exec"
|
|
"path/filepath"
|
|
"slices"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
"github.com/mattermost/mattermost/server/public/model"
|
|
"github.com/mattermost/mattermost/server/v8/channels/api4"
|
|
"github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
|
|
"github.com/mattermost/mattermost/server/v8/channels/testlib"
|
|
)
|
|
|
|
var coverprofileCounters = make(map[string]int)
|
|
|
|
var mainHelper *testlib.MainHelper
|
|
|
|
type testHelper struct {
|
|
*api4.TestHelper
|
|
|
|
config *model.Config
|
|
tempDir string
|
|
configFilePath string
|
|
disableAutoConfig bool
|
|
}
|
|
|
|
// Setup creates an instance of testHelper.
|
|
func SetupWithStoreMock(tb testing.TB) *testHelper {
|
|
dir, err := testlib.SetupTestResources()
|
|
require.NoError(tb, err)
|
|
tb.Cleanup(func() {
|
|
err = os.RemoveAll(dir)
|
|
require.NoError(tb, err)
|
|
})
|
|
|
|
api4TestHelper := api4.SetupWithStoreMock(tb)
|
|
systemStore := mocks.SystemStore{}
|
|
systemStore.On("Get").Return(make(model.StringMap), nil)
|
|
licenseStore := mocks.LicenseStore{}
|
|
licenseStore.On("Get", "").Return(&model.LicenseRecord{}, nil)
|
|
api4TestHelper.App.Srv().Store().(*mocks.Store).On("System").Return(&systemStore)
|
|
api4TestHelper.App.Srv().Store().(*mocks.Store).On("License").Return(&licenseStore)
|
|
|
|
testHelper := &testHelper{
|
|
TestHelper: api4TestHelper,
|
|
tempDir: dir,
|
|
configFilePath: filepath.Join(dir, "config-helper.json"),
|
|
}
|
|
|
|
config := &model.Config{}
|
|
config.SetDefaults()
|
|
testHelper.SetConfig(config)
|
|
|
|
return testHelper
|
|
}
|
|
|
|
// InitBasic simply proxies to api4.InitBasic, while still returning a testHelper.
|
|
func (h *testHelper) InitBasic(tb testing.TB) *testHelper {
|
|
h.TestHelper.InitBasic(tb)
|
|
return h
|
|
}
|
|
|
|
// TemporaryDirectory returns the temporary directory created for user by the test helper.
|
|
func (h *testHelper) TemporaryDirectory() string {
|
|
return h.tempDir
|
|
}
|
|
|
|
// Config returns the configuration passed to a running command.
|
|
func (h *testHelper) Config() *model.Config {
|
|
return h.config.Clone()
|
|
}
|
|
|
|
// ConfigPath returns the path to the temporary config file passed to a running command.
|
|
func (h *testHelper) ConfigPath() string {
|
|
return h.configFilePath
|
|
}
|
|
|
|
// SetConfig replaces the configuration passed to a running command.
|
|
func (h *testHelper) SetConfig(config *model.Config) {
|
|
if !testing.Short() {
|
|
config.SqlSettings = *mainHelper.GetSQLSettings()
|
|
}
|
|
|
|
h.config = config
|
|
|
|
buf, err := json.Marshal(config)
|
|
if err != nil {
|
|
panic("failed to marshal config: " + err.Error())
|
|
}
|
|
if err := os.WriteFile(h.configFilePath, buf, 0600); err != nil {
|
|
panic("failed to write file " + h.configFilePath + ": " + err.Error())
|
|
}
|
|
}
|
|
|
|
// SetAutoConfig configures whether the --config flag is automatically passed to a running command.
|
|
func (h *testHelper) SetAutoConfig(autoConfig bool) {
|
|
h.disableAutoConfig = !autoConfig
|
|
}
|
|
|
|
func (h *testHelper) execArgs(t *testing.T, args []string) []string {
|
|
ret := []string{"-test.v", "-test.run", "ExecCommand"}
|
|
if coverprofile := flag.Lookup("test.coverprofile").Value.String(); coverprofile != "" {
|
|
dir := filepath.Dir(coverprofile)
|
|
base := filepath.Base(coverprofile)
|
|
baseParts := strings.SplitN(base, ".", 2)
|
|
name := strings.Replace(t.Name(), "/", "_", -1)
|
|
coverprofileCounters[name] = coverprofileCounters[name] + 1
|
|
baseParts[0] = fmt.Sprintf("%v-%v-%v", baseParts[0], name, coverprofileCounters[name])
|
|
ret = append(ret, "-test.coverprofile", filepath.Join(dir, strings.Join(baseParts, ".")))
|
|
}
|
|
|
|
ret = append(ret, "--")
|
|
|
|
// Unless the test passes a `--config` of its own, create a temporary one from the default
|
|
// configuration with the current test database applied.
|
|
hasConfig := h.disableAutoConfig
|
|
if slices.Contains(args, "--config") {
|
|
hasConfig = true
|
|
}
|
|
|
|
if !hasConfig {
|
|
ret = append(ret, "--config", h.configFilePath)
|
|
}
|
|
|
|
ret = append(ret, args...)
|
|
|
|
return ret
|
|
}
|
|
|
|
func (h *testHelper) cmd(t *testing.T, args []string) *exec.Cmd {
|
|
path, err := os.Executable()
|
|
require.NoError(t, err)
|
|
cmd := exec.Command(path, h.execArgs(t, args)...)
|
|
|
|
cmd.Env = []string{}
|
|
for _, env := range os.Environ() {
|
|
// Ignore MM_SQLSETTINGS_DATASOURCE from the environment, since we override.
|
|
if strings.HasPrefix(env, "MM_SQLSETTINGS_DATASOURCE=") {
|
|
continue
|
|
}
|
|
|
|
cmd.Env = append(cmd.Env, env)
|
|
}
|
|
|
|
return cmd
|
|
}
|
|
|
|
// CheckCommand invokes the test binary, returning the output modified for assertion testing.
|
|
func (h *testHelper) CheckCommand(t *testing.T, args ...string) string {
|
|
output, err := h.cmd(t, args).CombinedOutput()
|
|
require.NoError(t, err, string(output))
|
|
return strings.TrimSpace(strings.TrimSuffix(strings.TrimSpace(string(output)), "PASS"))
|
|
}
|
|
|
|
// RunCommand invokes the test binary, returning only any error.
|
|
func (h *testHelper) RunCommand(t *testing.T, args ...string) error {
|
|
return h.cmd(t, args).Run()
|
|
}
|
|
|
|
// RunCommandWithOutput is a variant of RunCommand that returns the unmodified output and any error.
|
|
func (h *testHelper) RunCommandWithOutput(t *testing.T, args ...string) (string, error) {
|
|
cmd := h.cmd(t, args)
|
|
|
|
var buf bytes.Buffer
|
|
reader, writer := io.Pipe()
|
|
cmd.Stdout = writer
|
|
cmd.Stderr = writer
|
|
|
|
done := make(chan bool)
|
|
go func() {
|
|
io.Copy(&buf, reader)
|
|
close(done)
|
|
}()
|
|
|
|
err := cmd.Run()
|
|
writer.Close()
|
|
<-done
|
|
|
|
return buf.String(), err
|
|
}
|