1 files changed, 6 insertions, 164 deletions

diff --git a/plugin/rpcplugin/supervisor_test.go b/plugin/rpcplugin/supervisor_test.go
index bd20158b5..06c1fafeb 100644
--- a/plugin/rpcplugin/supervisor_test.go
+++ b/plugin/rpcplugin/supervisor_test.go
@@ -1,172 +1,14 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
 package rpcplugin
 
 import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
 	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"github.com/stretchr/testify/require"
 
-	"github.com/mattermost/mattermost-server/model"
-	"github.com/mattermost/mattermost-server/plugin/plugintest"
+	"github.com/mattermost/mattermost-server/plugin/rpcplugin/rpcplugintest"
 )
 
-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/rpcplugin"
-		)
-
-		type MyPlugin struct {}
-
-		func main() {
-			rpcplugin.Main(&MyPlugin{})
-		}
-	`, backend)
-
-	ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "backend.exe"}}`), 0600)
-
-	bundle := model.BundleInfoForPath(dir)
-	supervisor, err := SupervisorProvider(bundle)
-	require.NoError(t, err)
-	require.NoError(t, supervisor.Start(nil))
-	require.NoError(t, supervisor.Stop())
-}
-
-func TestSupervisor_InvalidExecutablePath(t *testing.T) {
-	dir, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
-
-	ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "/foo/../../backend.exe"}}`), 0600)
-
-	bundle := model.BundleInfoForPath(dir)
-	supervisor, err := SupervisorProvider(bundle)
-	assert.Nil(t, supervisor)
-	assert.Error(t, err)
-}
-
-func TestSupervisor_NonExistentExecutablePath(t *testing.T) {
-	dir, err := ioutil.TempDir("", "")
-	require.NoError(t, err)
-	defer os.RemoveAll(dir)
-
-	ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "thisfileshouldnotexist"}}`), 0600)
-
-	bundle := model.BundleInfoForPath(dir)
-	supervisor, err := SupervisorProvider(bundle)
-	require.NotNil(t, supervisor)
-	require.NoError(t, err)
-
-	require.Error(t, supervisor.Start(nil))
-}
-
-// If plugin development goes really wrong, let's make sure plugin activation won't block forever.
-func TestSupervisor_StartTimeout(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
-
-		func main() {
-			for {
-			}
-		}
-	`, backend)
-
-	ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "backend.exe"}}`), 0600)
-
-	bundle := model.BundleInfoForPath(dir)
-	supervisor, err := SupervisorProvider(bundle)
-	require.NoError(t, err)
-	require.Error(t, supervisor.Start(nil))
-}
-
-// Crashed plugins should be relaunched.
-func TestSupervisor_PluginCrash(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 (
-			"os"
-
-			"github.com/mattermost/mattermost-server/plugin"
-			"github.com/mattermost/mattermost-server/plugin/rpcplugin"
-		)
-
-		type Configuration struct {
-			ShouldExit bool
-		}
-
-		type MyPlugin struct {
-			config Configuration
-		}
-
-		func (p *MyPlugin) OnActivate(api plugin.API) error {
-			api.LoadPluginConfiguration(&p.config)
-			return nil
-		}
-
-		func (p *MyPlugin) OnDeactivate() error {
-			if p.config.ShouldExit {
-				os.Exit(1)
-			}
-			return nil
-		}
-
-		func main() {
-			rpcplugin.Main(&MyPlugin{})
-		}
-	`, backend)
-
-	ioutil.WriteFile(filepath.Join(dir, "plugin.json"), []byte(`{"id": "foo", "backend": {"executable": "backend.exe"}}`), 0600)
-
-	var api plugintest.API
-	shouldExit := true
-	api.On("LoadPluginConfiguration", mock.MatchedBy(func(x interface{}) bool { return true })).Return(func(dest interface{}) error {
-		err := json.Unmarshal([]byte(fmt.Sprintf(`{"ShouldExit": %v}`, shouldExit)), dest)
-		shouldExit = false
-		return err
-	})
-
-	bundle := model.BundleInfoForPath(dir)
-	supervisor, err := SupervisorProvider(bundle)
-	require.NoError(t, err)
-	require.NoError(t, supervisor.Start(&api))
-
-	failed := false
-	recovered := false
-	for i := 0; i < 30; i++ {
-		if supervisor.Hooks().OnDeactivate() == nil {
-			require.True(t, failed)
-			recovered = true
-			break
-		} else {
-			failed = true
-		}
-		time.Sleep(time.Millisecond * 100)
-	}
-	assert.True(t, recovered)
-	require.NoError(t, supervisor.Stop())
+func TestSupervisorProvider(t *testing.T) {
+	rpcplugintest.TestSupervisorProvider(t, SupervisorProvider)
 }