Chore: Fix flaky cloud migration test (#94035)
* attempt to fix flaky test * remove skip from test
This commit is contained in:
@@ -100,12 +100,13 @@ func setupTestMigrateToPluginService(t *testing.T) (*MigrateToPluginService, sec
|
||||
raw, err := ini.Load([]byte(rawCfg))
|
||||
require.NoError(t, err)
|
||||
cfg := &setting.Cfg{Raw: raw}
|
||||
sqlStore := db.InitTestDB(t)
|
||||
|
||||
// this would be the plugin - mocked at the moment
|
||||
fallbackStore := secretskvs.WithCache(secretskvs.NewFakeSQLSecretsKVStore(t), time.Minute*5, time.Minute*5)
|
||||
fallbackStore := secretskvs.WithCache(secretskvs.NewFakeSQLSecretsKVStore(t, sqlStore), time.Minute*5, time.Minute*5)
|
||||
secretsStoreForPlugin := secretskvs.WithCache(secretskvs.NewFakePluginSecretsKVStore(t, featuremgmt.WithFeatures(), fallbackStore), time.Minute*5, time.Minute*5)
|
||||
|
||||
// this is to init the sql secret store inside the migration
|
||||
sqlStore := db.InitTestDB(t)
|
||||
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
|
||||
manager := secretskvs.NewFakeSecretsPluginManager(t, false)
|
||||
migratorService := ProvideMigrateToPluginService(
|
||||
|
||||
@@ -20,12 +20,12 @@ import (
|
||||
"github.com/grafana/grafana/pkg/services/featuremgmt"
|
||||
"github.com/grafana/grafana/pkg/services/secrets/fakes"
|
||||
secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
|
||||
"github.com/grafana/grafana/pkg/services/sqlstore"
|
||||
"github.com/grafana/grafana/pkg/setting"
|
||||
)
|
||||
|
||||
func NewFakeSQLSecretsKVStore(t *testing.T) *SecretsKVStoreSQL {
|
||||
func NewFakeSQLSecretsKVStore(t *testing.T, sqlStore *sqlstore.SQLStore) *SecretsKVStoreSQL {
|
||||
t.Helper()
|
||||
sqlStore := db.InitTestDB(t)
|
||||
secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
|
||||
return NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user