IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Remove bus.Bus field (#47695)

Browse Source 
* Chore: Remove bus.Bus field

* fix integration test
This commit is contained in:
Serge Zaitsev
2022-04-13 15:24:13 +02:00
committed by GitHub
parent 337d5bf423
commit e86b6662a1
38 changed files with 70 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/tests/api/alerting/api_alertmanager_test.go
View File

@@ -16,7 +16,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/bus"
"github.com/grafana/grafana/pkg/components/simplejson"
"github.com/grafana/grafana/pkg/infra/tracing"
"github.com/grafana/grafana/pkg/models"
@@ -40,8 +39,6 @@ func TestAMConfigAccess(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
// Create a users to make authenticated requests
createUser(t, store, models.CreateUserCommand{
@@ -403,8 +400,6 @@ func TestAlertAndGroupsQuery(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
// unauthenticated request to get the alerts should fail
{
@@ -574,8 +569,6 @@ func TestRulerAccess(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
// Create the namespace we'll save our alerts to.
_, err = createFolder(t, store, 0, "default")
@@ -704,8 +697,6 @@ func TestDeleteFolderWithRules(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
// Create the namespace we'll save our alerts to.
namespaceUID, err := createFolder(t, store, 0, "default")
@@ -866,8 +857,6 @@ func TestAlertRuleCRUD(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
createUser(t, store, models.CreateUserCommand{
DefaultOrgRole: string(models.ROLE_EDITOR),
@@ -2001,8 +1990,6 @@ func TestQuota(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
// Create the namespace we'll save our alerts to.
_, err = createFolder(t, store, 0, "default")
@@ -2248,8 +2235,6 @@ func TestEval(t *testing.T) {
})
grafanaListedAddr, store := testinfra.StartGrafana(t, dir, path)
// override bus to get the GetSignedInUserQuery handler
store.Bus = bus.GetBus()
createUser(t, store, models.CreateUserCommand{
DefaultOrgRole: string(models.ROLE_EDITOR),