From 8dbba467f158703948103c7d9c0a5dd4cbb04e0e Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Mon, 17 Sep 2018 17:29:11 +0200
Subject: [PATCH] moves /tests to /pkg/plugins

ref #11433
---
 pkg/plugins/dashboard_importer_test.go                        | 4 ++--
 pkg/plugins/dashboards_test.go                                | 2 +-
 pkg/plugins/plugins_test.go                                   | 2 +-
 {tests => pkg/plugins/testdata}/datasource-test/module.js     | 0
 {tests => pkg/plugins/testdata}/datasource-test/plugin.json   | 0
 .../plugins/testdata}/test-app/dashboards/connections.json    | 0
 .../testdata}/test-app/dashboards/connections_result.json     | 0
 .../plugins/testdata}/test-app/dashboards/memory.json         | 0
 {tests => pkg/plugins/testdata}/test-app/plugin.json          | 0
 9 files changed, 4 insertions(+), 4 deletions(-)
 rename {tests => pkg/plugins/testdata}/datasource-test/module.js (100%)
 rename {tests => pkg/plugins/testdata}/datasource-test/plugin.json (100%)
 rename {tests => pkg/plugins/testdata}/test-app/dashboards/connections.json (100%)
 rename {tests => pkg/plugins/testdata}/test-app/dashboards/connections_result.json (100%)
 rename {tests => pkg/plugins/testdata}/test-app/dashboards/memory.json (100%)
 rename {tests => pkg/plugins/testdata}/test-app/plugin.json (100%)

diff --git a/pkg/plugins/dashboard_importer_test.go b/pkg/plugins/dashboard_importer_test.go
index 6f31b49f99d..ca8dfcd515c 100644
--- a/pkg/plugins/dashboard_importer_test.go
+++ b/pkg/plugins/dashboard_importer_test.go
@@ -35,7 +35,7 @@ func TestDashboardImport(t *testing.T) {
 			So(cmd.Result, ShouldNotBeNil)
 
 			resultStr, _ := mock.SavedDashboards[0].Dashboard.Data.EncodePretty()
-			expectedBytes, _ := ioutil.ReadFile("../../tests/test-app/dashboards/connections_result.json")
+			expectedBytes, _ := ioutil.ReadFile("testdata/test-app/dashboards/connections_result.json")
 			expectedJson, _ := simplejson.NewJson(expectedBytes)
 			expectedStr, _ := expectedJson.EncodePretty()
 
@@ -89,7 +89,7 @@ func pluginScenario(desc string, t *testing.T, fn func()) {
 	Convey("Given a plugin", t, func() {
 		setting.Raw = ini.Empty()
 		sec, _ := setting.Raw.NewSection("plugin.test-app")
-		sec.NewKey("path", "../../tests/test-app")
+		sec.NewKey("path", "testdata/test-app")
 
 		pm := &PluginManager{}
 		err := pm.Init()
diff --git a/pkg/plugins/dashboards_test.go b/pkg/plugins/dashboards_test.go
index c422a1431c0..6fc6ace0e00 100644
--- a/pkg/plugins/dashboards_test.go
+++ b/pkg/plugins/dashboards_test.go
@@ -16,7 +16,7 @@ func TestPluginDashboards(t *testing.T) {
 	Convey("When asking plugin dashboard info", t, func() {
 		setting.Raw = ini.Empty()
 		sec, _ := setting.Raw.NewSection("plugin.test-app")
-		sec.NewKey("path", "../../tests/test-app")
+		sec.NewKey("path", "testdata/test-app")
 
 		pm := &PluginManager{}
 		err := pm.Init()
diff --git a/pkg/plugins/plugins_test.go b/pkg/plugins/plugins_test.go
index fa68ae4389d..d16e6abb4c7 100644
--- a/pkg/plugins/plugins_test.go
+++ b/pkg/plugins/plugins_test.go
@@ -30,7 +30,7 @@ func TestPluginScans(t *testing.T) {
 	Convey("When reading app plugin definition", t, func() {
 		setting.Raw = ini.Empty()
 		sec, _ := setting.Raw.NewSection("plugin.nginx-app")
-		sec.NewKey("path", "../../tests/test-app")
+		sec.NewKey("path", "testdata/test-app")
 
 		pm := &PluginManager{}
 		err := pm.Init()
diff --git a/tests/datasource-test/module.js b/pkg/plugins/testdata/datasource-test/module.js
similarity index 100%
rename from tests/datasource-test/module.js
rename to pkg/plugins/testdata/datasource-test/module.js
diff --git a/tests/datasource-test/plugin.json b/pkg/plugins/testdata/datasource-test/plugin.json
similarity index 100%
rename from tests/datasource-test/plugin.json
rename to pkg/plugins/testdata/datasource-test/plugin.json
diff --git a/tests/test-app/dashboards/connections.json b/pkg/plugins/testdata/test-app/dashboards/connections.json
similarity index 100%
rename from tests/test-app/dashboards/connections.json
rename to pkg/plugins/testdata/test-app/dashboards/connections.json
diff --git a/tests/test-app/dashboards/connections_result.json b/pkg/plugins/testdata/test-app/dashboards/connections_result.json
similarity index 100%
rename from tests/test-app/dashboards/connections_result.json
rename to pkg/plugins/testdata/test-app/dashboards/connections_result.json
diff --git a/tests/test-app/dashboards/memory.json b/pkg/plugins/testdata/test-app/dashboards/memory.json
similarity index 100%
rename from tests/test-app/dashboards/memory.json
rename to pkg/plugins/testdata/test-app/dashboards/memory.json
diff --git a/tests/test-app/plugin.json b/pkg/plugins/testdata/test-app/plugin.json
similarity index 100%
rename from tests/test-app/plugin.json
rename to pkg/plugins/testdata/test-app/plugin.json