@@ -199,6 +199,15 @@ func CreateGrafDir(t *testing.T, opts ...GrafanaOpts) (string, string) {
|
||||
_, err = serverSect.NewKey("static_root_path", publicDir)
|
||||
require.NoError(t, err)
|
||||
|
||||
authSect, err := cfg.NewSection("auth")
|
||||
require.NoError(t, err)
|
||||
authBrokerState := "false"
|
||||
if len(opts) > 0 && opts[0].AuthBrokerEnabled {
|
||||
authBrokerState = "true"
|
||||
}
|
||||
_, err = authSect.NewKey("broker", authBrokerState)
|
||||
require.NoError(t, err)
|
||||
|
||||
anonSect, err := cfg.NewSection("auth.anonymous")
|
||||
require.NoError(t, err)
|
||||
_, err = anonSect.NewKey("enabled", "true")
|
||||
@@ -384,6 +393,7 @@ type GrafanaOpts struct {
|
||||
EnableLog bool
|
||||
GRPCServerAddress string
|
||||
QueryRetries int64
|
||||
AuthBrokerEnabled bool
|
||||
}
|
||||
|
||||
func CreateUser(t *testing.T, store *sqlstore.SQLStore, cmd user.CreateUserCommand) *user.User {
|
||||
|
||||
@@ -13,7 +13,6 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"github.com/grafana/grafana/pkg/services/login"
|
||||
databaseAuthInfo "github.com/grafana/grafana/pkg/services/login/authinfoservice/database"
|
||||
"github.com/grafana/grafana/pkg/services/secrets/database"
|
||||
@@ -119,14 +118,12 @@ func TestIntegrationIndexViewAnalytics(t *testing.T) {
|
||||
}
|
||||
|
||||
// can be removed once ff is removed
|
||||
testCaseFeatures := map[string][]string{"none": {}, "authnService": {featuremgmt.FlagAuthnService}}
|
||||
authBrokerStates := map[string]bool{"none": false, "authnService": true}
|
||||
|
||||
for k, tcFeatures := range testCaseFeatures {
|
||||
for k, enabled := range authBrokerStates {
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name+"-"+k, func(t *testing.T) {
|
||||
grafDir, cfgPath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{
|
||||
EnableFeatureToggles: tcFeatures,
|
||||
})
|
||||
grafDir, cfgPath := testinfra.CreateGrafDir(t, testinfra.GrafanaOpts{AuthBrokerEnabled: enabled})
|
||||
addr, store := testinfra.StartGrafana(t, grafDir, cfgPath)
|
||||
createdUser := testinfra.CreateUser(t, store, user.CreateUserCommand{
|
||||
Login: "admin",
|
||||
|
||||
Reference in New Issue
Block a user