Not skiping tests on commands, and removing unnecesary main_test.go files (#14032)

api4/apitestlib.go

@@ -59,6 +59,10 @@ type TestHelper struct {
 
 var mainHelper *testlib.MainHelper
 
+func SetMainHelper(mh *testlib.MainHelper) {
+	mainHelper = mh
+}
+
 func setupTestHelper(dbStore store.Store, enterprise bool, includeCache bool, updateConfig func(*model.Config)) *TestHelper {
 	tempWorkspace, err := ioutil.TempDir("", "apptest")
 	if err != nil {

cmd/mattermost/commands/main_test.go

@@ -8,6 +8,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/mattermost/mattermost-server/v5/api4"
 	"github.com/mattermost/mattermost-server/v5/testlib"
 )
 
@@ -28,6 +29,7 @@ func TestMain(m *testing.M) {
 
 	mainHelper = testlib.NewMainHelperWithOptions(&options)
 	defer mainHelper.Close()
+	api4.SetMainHelper(mainHelper)
 
 	mainHelper.Main(m)
 }

mlog/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

model/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package model_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

plugin/main_test.go

@@ -1,22 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package plugin_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	var options = testlib.HelperOptions{
-		EnableResources: true,
-	}
-	mainHelper = testlib.NewMainHelperWithOptions(&options)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

services/mfa/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mfa_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

utils/fileutils/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package fileutils_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

utils/jsonutils/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package jsonutils_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

utils/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package utils_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}

utils/markdown/main_test.go

@@ -1,19 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package markdown_test
-
-import (
-	"testing"
-
-	"github.com/mattermost/mattermost-server/v5/testlib"
-)
-
-var mainHelper *testlib.MainHelper
-
-func TestMain(m *testing.M) {
-	mainHelper = testlib.NewMainHelperWithOptions(nil)
-	defer mainHelper.Close()
-
-	mainHelper.Main(m)
-}