From b511788c51121f7847ec4d0d41f7182546dedf02 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 15 Jan 2018 10:26:33 +0100 Subject: [PATCH] code style fixes --- pkg/plugins/dashboard_importer_test.go | 2 +- pkg/plugins/dashboards_test.go | 2 +- pkg/plugins/plugins.go | 2 -- pkg/plugins/plugins_test.go | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkg/plugins/dashboard_importer_test.go b/pkg/plugins/dashboard_importer_test.go index 7272e5a1e2e..a13dc8fe0a5 100644 --- a/pkg/plugins/dashboard_importer_test.go +++ b/pkg/plugins/dashboard_importer_test.go @@ -92,7 +92,7 @@ func pluginScenario(desc string, t *testing.T, fn func()) { setting.Cfg = ini.Empty() sec, _ := setting.Cfg.NewSection("plugin.test-app") sec.NewKey("path", "../../tests/test-app") - err := initPlugins(context.TODO()) + err := initPlugins(context.Background()) So(err, ShouldBeNil) diff --git a/pkg/plugins/dashboards_test.go b/pkg/plugins/dashboards_test.go index bd0fd96a100..8573d452409 100644 --- a/pkg/plugins/dashboards_test.go +++ b/pkg/plugins/dashboards_test.go @@ -18,7 +18,7 @@ func TestPluginDashboards(t *testing.T) { setting.Cfg = ini.Empty() sec, _ := setting.Cfg.NewSection("plugin.test-app") sec.NewKey("path", "../../tests/test-app") - err := initPlugins(context.TODO()) + err := initPlugins(context.Background()) So(err, ShouldBeNil) diff --git a/pkg/plugins/plugins.go b/pkg/plugins/plugins.go index 4bf2de94d46..417f565dd0c 100644 --- a/pkg/plugins/plugins.go +++ b/pkg/plugins/plugins.go @@ -35,8 +35,6 @@ type PluginScanner struct { errors []error } -type Dispose func() - type PluginManager struct { log log.Logger } diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go index 1b9e27ba5b4..4d3ccb4502b 100644 --- a/pkg/plugins/plugins_test.go +++ b/pkg/plugins/plugins_test.go @@ -15,7 +15,7 @@ func TestPluginScans(t *testing.T) { Convey("When scaning for plugins", t, func() { setting.StaticRootPath, _ = filepath.Abs("../../public/") setting.Cfg = ini.Empty() - err := initPlugins(context.TODO()) + err := initPlugins(context.Background()) So(err, ShouldBeNil) So(len(DataSources), ShouldBeGreaterThan, 1) @@ -30,7 +30,7 @@ func TestPluginScans(t *testing.T) { setting.Cfg = ini.Empty() sec, _ := setting.Cfg.NewSection("plugin.nginx-app") sec.NewKey("path", "../../tests/test-app") - err := initPlugins(context.TODO()) + err := initPlugins(context.Background()) So(err, ShouldBeNil) So(len(Apps), ShouldBeGreaterThan, 0)