Testdata: Rename package to circumvent convention in go (#19409)

Before this change the tests for test datasource was not run.

pkg/api/metrics.go

@@ -9,7 +9,7 @@ import (
 	"github.com/grafana/grafana/pkg/components/simplejson"
 	m "github.com/grafana/grafana/pkg/models"
 	"github.com/grafana/grafana/pkg/tsdb"
-	"github.com/grafana/grafana/pkg/tsdb/testdata"
+	"github.com/grafana/grafana/pkg/tsdb/testdatasource"
 	"github.com/grafana/grafana/pkg/util"
 )
 
@@ -68,13 +68,13 @@ func GetTestDataScenarios(c *m.ReqContext) Response {
 	result := make([]interface{}, 0)
 
 	scenarioIds := make([]string, 0)
-	for id := range testdata.ScenarioRegistry {
+	for id := range testdatasource.ScenarioRegistry {
 		scenarioIds = append(scenarioIds, id)
 	}
 	sort.Strings(scenarioIds)
 
 	for _, scenarioId := range scenarioIds {
-		scenario := testdata.ScenarioRegistry[scenarioId]
+		scenario := testdatasource.ScenarioRegistry[scenarioId]
 		result = append(result, map[string]interface{}{
 			"id":          scenario.Id,
 			"name":        scenario.Name,

pkg/cmd/grafana-server/main.go

@@ -29,7 +29,7 @@ import (
 	_ "github.com/grafana/grafana/pkg/tsdb/postgres"
 	_ "github.com/grafana/grafana/pkg/tsdb/prometheus"
 	_ "github.com/grafana/grafana/pkg/tsdb/stackdriver"
-	_ "github.com/grafana/grafana/pkg/tsdb/testdata"
+	_ "github.com/grafana/grafana/pkg/tsdb/testdatasource"
 )
 
 var version = "5.0.0"

pkg/tsdb/testdatasource/scenarios.go

@@ -1,4 +1,4 @@
-package testdata
+package testdatasource
 
 import (
 	"encoding/json"
@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/grafana/grafana/pkg/components/simplejson"
+	"github.com/grafana/grafana/pkg/util/errutil"
 
 	"github.com/grafana/grafana/pkg/components/null"
 	"github.com/grafana/grafana/pkg/infra/log"
@@ -188,11 +189,11 @@ func init() {
 					value = null.FloatFrom(valueFloat)
 				}
 
-				if timeInt, err := strconv.ParseInt(string(pointValues[1].(json.Number)), 10, 64); err != nil {
+				timeInt, err := strconv.ParseInt(string(pointValues[1].(json.Number)), 10, 64)
+				if err != nil {
 					continue
-				} else {
-					time = timeInt
 				}
+				time = timeInt
 
 				if time >= startTime && time <= endTime {
 					series.Points = append(series.Points, tsdb.NewTimePoint(value, float64(time)))
@@ -447,7 +448,7 @@ func getPredictableCSVWave(query *tsdb.Query, context *tsdb.TsdbQuery) *tsdb.Que
 	for i, rawValue := range rawValesCSV {
 		val, err := null.FloatFromString(strings.TrimSpace(rawValue), "null")
 		if err != nil {
-			queryRes.Error = fmt.Errorf("failed to parse value '%v' into nullable float: err", rawValue, err)
+			queryRes.Error = errutil.Wrapf(err, "failed to parse value '%v' into nullable float", rawValue)
 			return queryRes
 		}
 		values[i] = val
@@ -558,6 +559,7 @@ func parseLabels(text string) map[string]string {
 		idx := strings.Index(keyval, "=")
 		key := strings.TrimSpace(keyval[:idx])
 		val := strings.TrimSpace(keyval[idx+1:])
+		val = strings.Trim(val, "\"")
 		tags[key] = val
 	}
 

pkg/tsdb/testdatasource/scenarios_test.go

@@ -1,4 +1,4 @@
-package testdata
+package testdatasource
 
 import (
 	"testing"
@@ -11,7 +11,7 @@ import (
 
 func TestTestdataScenarios(t *testing.T) {
 	Convey("random walk ", t, func() {
-		scenario, _ := ScenarioRegistry["random_walk"]
+		scenario := ScenarioRegistry["random_walk"]
 
 		Convey("Should start at the requested value", func() {
 			req := &tsdb.TsdbQuery{
@@ -32,7 +32,7 @@ func TestTestdataScenarios(t *testing.T) {
 	})
 
 	Convey("random walk table", t, func() {
-		scenario, _ := ScenarioRegistry["random_walk_table"]
+		scenario := ScenarioRegistry["random_walk_table"]
 
 		Convey("Should return a table that looks like value/min/max", func() {
 			req := &tsdb.TsdbQuery{
@@ -99,9 +99,9 @@ func TestToLabels(t *testing.T) {
 		tags["job"] = "foo"
 		tags["instance"] = "bar"
 
-		So(parseLabels(`{job="foo", instance="bar"}`), ShouldEqual, tags)
-		So(parseLabels(`job="foo", instance="bar"`), ShouldEqual, tags)
-		So(parseLabels(`job=foo, instance=bar`), ShouldEqual, tags)
-		So(parseLabels(`job = foo,instance = bar`), ShouldEqual, tags)
+		So(parseLabels(`{job="foo", instance="bar"}`), ShouldResemble, tags)
+		So(parseLabels(`job="foo", instance="bar"`), ShouldResemble, tags)
+		So(parseLabels(`job=foo, instance=bar`), ShouldResemble, tags)
+		So(parseLabels(`job = foo,instance = bar`), ShouldResemble, tags)
 	})
 }

pkg/tsdb/testdatasource/testdata.go

@@ -1,4 +1,4 @@
-package testdata
+package testdatasource
 
 import (
 	"context"

pkg/tsdb/testdatasource/utils.go

@@ -1,4 +1,4 @@
-package testdata
+package testdatasource
 
 import (
 	"math/rand"