IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-09 23:16:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Before this change the tests for test datasource was not run.
This commit is contained in:
Marcus Efraimsson 2019-09-27 16:18:24 +02:00 committed by GitHub
parent d6eb4e8459
commit 00e7c7c4b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/metrics.go
View File

@ -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,

2
pkg/cmd/grafana-server/main.go
View File

@ -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"

12
pkg/tsdb/testdata/scenarios.go → pkg/tsdb/testdatasource/scenarios.go
View File

@ -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
}

14
pkg/tsdb/testdata/scenarios_test.go → pkg/tsdb/testdatasource/scenarios_test.go
View File

@ -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)
})
}

2
pkg/tsdb/testdata/testdata.go → pkg/tsdb/testdatasource/testdata.go
View File

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

2
pkg/tsdb/testdata/utils.go → pkg/tsdb/testdatasource/utils.go
View File

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

2
public/app/plugins/datasource/testdata/partials/query.editor.html vendored
View File

@ -35,7 +35,7 @@
<label class="gf-form-label query-keyword width-7">New value</label>
<input type="number" class="gf-form-input width-15" placeholder="value" ng-model="ctrl.newPointValue">
<label class="gf-form-label query-keyword">Time</label>
<input type="string" class="gf-form-input width-12" placeholder="time" ng-model="ctrl.newPointTime" input-datetime>
<input type="string" class="gf-form-input width-12" placeholder="time" ng-model="ctrl.newPointTime">
<button class="btn btn-secondary gf-form-btn" ng-click="ctrl.addPoint()">Add</button>
<label class="gf-form-label query-keyword">All values</label>
<gf-form-dropdown css-class="width-12" model="ctrl.selectedPoint" get-options="ctrl.getPoints()" on-change="ctrl.pointSelected($option)">

3
public/app/plugins/datasource/testdata/query_ctrl.ts vendored
View File

@ -3,7 +3,7 @@ import _ from 'lodash';
import { QueryCtrl } from 'app/plugins/sdk';
import { defaultQuery } from './runStreams';
import { getBackendSrv } from 'app/core/services/backend_srv';
import { dateTime } from '@grafana/data';
import { dateTime, dateMath } from '@grafana/data';
export const defaultPulse: any = {
timeStep: 60,
@ -63,6 +63,7 @@ export class TestDataQueryCtrl extends QueryCtrl {
addPoint() {
this.target.points = this.target.points || [];
this.newPointTime = dateMath.parse(this.newPointTime);
this.target.points.push([this.newPointValue, this.newPointTime.valueOf()]);
this.target.points = _.sortBy(this.target.points, p => p[1]);
this.refresh();