public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove bus from tests to fix merge conflicts

Browse Source
This commit is contained in:
Guilherme Caulada
2022-04-18 08:50:51 -03:00
parent cfaaba9449
commit 41ad79df5c
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/metrics_test.go
+1 -2
View File
@@ -9,7 +9,6 @@ import (
"strings"
"testing"
"github.com/grafana/grafana/pkg/bus"
acmock "github.com/grafana/grafana/pkg/services/accesscontrol/mock"
"github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/sqlstore/mockstore"
@@ -197,7 +196,7 @@ func TestAPIEndpoint_Metrics_QueryMetricsFromDashboard(t *testing.T) {
sc := setupHTTPServerWithMockDb(t, false, false)
ss := kvstore.SetupTestService(t)
ds := datasources.ProvideService(bus.New(), nil, ss, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
ds := datasources.ProvideService(nil, ss, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
setInitCtxSignedInViewer(sc.initCtx)
sc.hs.queryDataService = query.ProvideService(
pkg/services/query/query_test.go
+1 -2
View File
@@ -10,7 +10,6 @@ import (
"github.com/grafana/grafana-plugin-sdk-go/backend"
"github.com/grafana/grafana/pkg/api/dtos"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/plugins"
@@ -69,7 +68,7 @@ func setup(t *testing.T) *testContext {
rv := &fakePluginRequestValidator{}
ss := kvstore.SetupTestService(t)
ds := datasources.ProvideService(bus.New(), nil, ss, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
ds := datasources.ProvideService(nil, ss, nil, featuremgmt.WithFeatures(), acmock.New(), acmock.NewPermissionsServicesMock())
return &testContext{
pluginContext: pc,