From 4731b8f9b993536ed61dbc065e161e8994253f0d Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 12 Sep 2017 14:12:29 -0500 Subject: fix plugin test (#7436) * fix plugin test * ugh. global state * Fix plugin test * Fix TestDeleteChannel * Remove plugin config listener when shutting down --- api4/plugin_test.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'api4/plugin_test.go') diff --git a/api4/plugin_test.go b/api4/plugin_test.go index 898649f56..f92e58ea0 100644 --- a/api4/plugin_test.go +++ b/api4/plugin_test.go @@ -26,17 +26,21 @@ func TestPlugin(t *testing.T) { os.RemoveAll(webappDir) }() - th := Setup().InitBasic().InitSystemAdmin() + th := SetupEnterprise().InitBasic().InitSystemAdmin() defer TearDown() - th.App.InitPlugins(pluginDir, webappDir) - enablePlugins := *utils.Cfg.PluginSettings.Enable defer func() { *utils.Cfg.PluginSettings.Enable = enablePlugins }() *utils.Cfg.PluginSettings.Enable = true + th.App.InitPlugins(pluginDir, webappDir) + defer func() { + th.App.ShutDownPlugins() + th.App.PluginEnv = nil + }() + path, _ := utils.FindDir("tests") file, err := os.Open(path + "/testplugin.tar.gz") if err != nil { @@ -108,7 +112,5 @@ func TestPlugin(t *testing.T) { CheckForbiddenStatus(t, resp) _, resp = th.SystemAdminClient.RemovePlugin("bad.id") - CheckNotFoundStatus(t, resp) - - th.App.PluginEnv = nil + CheckBadRequestStatus(t, resp) } -- cgit v1.2.3-1-g7c22