From 7c3e651a7be592889e2a48ea0fb44d0871d27340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 11 Mar 2020 16:25:45 +0100 Subject: [PATCH] Not skiping tests on commands, and removing unnecesary main_test.go files (#14032) --- api4/apitestlib.go | 4 ++++ cmd/mattermost/commands/main_test.go | 2 ++ mlog/main_test.go | 19 ------------------- model/main_test.go | 19 ------------------- plugin/main_test.go | 22 ---------------------- services/mfa/main_test.go | 19 ------------------- utils/fileutils/main_test.go | 19 ------------------- utils/jsonutils/main_test.go | 19 ------------------- utils/main_test.go | 19 ------------------- utils/markdown/main_test.go | 19 ------------------- 10 files changed, 6 insertions(+), 155 deletions(-) delete mode 100644 mlog/main_test.go delete mode 100644 model/main_test.go delete mode 100644 plugin/main_test.go delete mode 100644 services/mfa/main_test.go delete mode 100644 utils/fileutils/main_test.go delete mode 100644 utils/jsonutils/main_test.go delete mode 100644 utils/main_test.go delete mode 100644 utils/markdown/main_test.go diff --git a/api4/apitestlib.go b/api4/apitestlib.go index 81d7b8d577..5fee871421 100644 --- a/api4/apitestlib.go +++ b/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 { diff --git a/cmd/mattermost/commands/main_test.go b/cmd/mattermost/commands/main_test.go index cb1be3f385..eb0bcfe772 100644 --- a/cmd/mattermost/commands/main_test.go +++ b/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) } diff --git a/mlog/main_test.go b/mlog/main_test.go deleted file mode 100644 index 3335e0cff6..0000000000 --- a/mlog/main_test.go +++ /dev/null @@ -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) -} diff --git a/model/main_test.go b/model/main_test.go deleted file mode 100644 index 986ed0f5cb..0000000000 --- a/model/main_test.go +++ /dev/null @@ -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) -} diff --git a/plugin/main_test.go b/plugin/main_test.go deleted file mode 100644 index 69c83b0cde..0000000000 --- a/plugin/main_test.go +++ /dev/null @@ -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) -} diff --git a/services/mfa/main_test.go b/services/mfa/main_test.go deleted file mode 100644 index caebdb60e0..0000000000 --- a/services/mfa/main_test.go +++ /dev/null @@ -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) -} diff --git a/utils/fileutils/main_test.go b/utils/fileutils/main_test.go deleted file mode 100644 index 4c4e1ff548..0000000000 --- a/utils/fileutils/main_test.go +++ /dev/null @@ -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) -} diff --git a/utils/jsonutils/main_test.go b/utils/jsonutils/main_test.go deleted file mode 100644 index 3a7db37a76..0000000000 --- a/utils/jsonutils/main_test.go +++ /dev/null @@ -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) -} diff --git a/utils/main_test.go b/utils/main_test.go deleted file mode 100644 index d434711636..0000000000 --- a/utils/main_test.go +++ /dev/null @@ -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) -} diff --git a/utils/markdown/main_test.go b/utils/markdown/main_test.go deleted file mode 100644 index a601790712..0000000000 --- a/utils/markdown/main_test.go +++ /dev/null @@ -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) -}