summaryrefslogtreecommitdiffstats
path: root/plugin/supervisor_test.go
diff options
context:
space:
mode:
Diffstat (limited to 'plugin/supervisor_test.go')
-rw-r--r--plugin/supervisor_test.go44
1 files changed, 2 insertions, 42 deletions
diff --git a/plugin/supervisor_test.go b/plugin/supervisor_test.go
index 19d0499e5..4c5275c43 100644
--- a/plugin/supervisor_test.go
+++ b/plugin/supervisor_test.go
@@ -13,13 +13,11 @@ import (
"github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model"
"github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
)
func TestSupervisor(t *testing.T) {
for name, f := range map[string]func(*testing.T){
- "Supervisor": testSupervisor,
"Supervisor_InvalidExecutablePath": testSupervisor_InvalidExecutablePath,
"Supervisor_NonExistentExecutablePath": testSupervisor_NonExistentExecutablePath,
"Supervisor_StartTimeout": testSupervisor_StartTimeout,
@@ -28,7 +26,7 @@ func TestSupervisor(t *testing.T) {
}
}
-func CompileGo(t *testing.T, sourceCode, outputPath string) {
+func compileGo(t *testing.T, sourceCode, outputPath string) {
dir, err := ioutil.TempDir(".", "")
require.NoError(t, err)
defer os.RemoveAll(dir)
@@ -40,44 +38,6 @@ func CompileGo(t *testing.T, sourceCode, outputPath string) {
require.NoError(t, cmd.Run())
}
-func testSupervisor(t *testing.T) {
- dir, err := ioutil.TempDir("", "")
- require.NoError(t, err)
- defer os.RemoveAll(dir)
-
- backend := filepath.Join(dir, "backend.exe")
- CompileGo(t, `
- package main
-
- import (
- "github.com/mattermost/mattermost-server/plugin"
- )
-
- type MyPlugin struct {
- plugin.MattermostPlugin
- }
-
- func main() {
- plugin.ClientMain(&MyPlugin{})
- }
- `, backend)
-
- ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "backend.exe"}}`), 0600)
-
- bundle := model.BundleInfoForPath(dir)
- var api MockAPI
- api.On("LoadPluginConfiguration", mock.Anything).Return(nil)
- log := mlog.NewLogger(&mlog.LoggerConfiguration{
- EnableConsole: true,
- ConsoleJson: true,
- ConsoleLevel: "error",
- EnableFile: false,
- })
- supervisor, err := newSupervisor(bundle, log, &api)
- require.NoError(t, err)
- supervisor.Shutdown()
-}
-
func testSupervisor_InvalidExecutablePath(t *testing.T) {
dir, err := ioutil.TempDir("", "")
require.NoError(t, err)
@@ -123,7 +83,7 @@ func testSupervisor_StartTimeout(t *testing.T) {
defer os.RemoveAll(dir)
backend := filepath.Join(dir, "backend.exe")
- CompileGo(t, `
+ compileGo(t, `
package main
func main() {