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: Fix flaky cloud migration test (#94035)

Browse Source 
* attempt to fix flaky test

* remove skip from test
This commit is contained in:
Michael Mandrus 2024-09-30 22:24:47 -04:00 committed by GitHub
parent 0c1aafd643
commit 1c648fd010
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/cloudmigration/cloudmigrationimpl/cloudmigration_test.go
View File

@ -617,7 +617,7 @@ func setUpServiceTest(t *testing.T, withDashboardMock bool) cloudmigration.Servi
featuremgmt.FlagDashboardRestore), featuremgmt.FlagDashboardRestore),
sqlStore, sqlStore,
dsService, dsService,
secretskv.NewFakeSQLSecretsKVStore(t), secretskv.NewFakeSQLSecretsKVStore(t, sqlStore),
secretsService, secretsService,
rr, rr,
prometheus.DefaultRegisterer, prometheus.DefaultRegisterer,

4
pkg/services/cloudmigration/cloudmigrationimpl/xorm_store_test.go
View File

@ -228,8 +228,6 @@ func Test_SnapshotResources(t *testing.T) {
} }
func TestGetSnapshotList(t *testing.T) { func TestGetSnapshotList(t *testing.T) {
t.Skip("FLAKY test: disabled until fixed")
_, s := setUpTest(t) _, s := setUpTest(t)
// Taken from setUpTest // Taken from setUpTest
sessionUID := "qwerty" sessionUID := "qwerty"
@ -322,7 +320,7 @@ func setUpTest(t *testing.T) (*sqlstore.SQLStore, *sqlStore) {
s := &sqlStore{ s := &sqlStore{
db: testDB, db: testDB,
secretsService: fakeSecrets.FakeSecretsService{}, secretsService: fakeSecrets.FakeSecretsService{},
secretsStore: secretskv.NewFakeSQLSecretsKVStore(t), secretsStore: secretskv.NewFakeSQLSecretsKVStore(t, testDB),
} }
ctx := context.Background() ctx := context.Background()

5
pkg/services/secrets/kvstore/migrations/to_plugin_mig_test.go
View File

@ -100,12 +100,13 @@ func setupTestMigrateToPluginService(t *testing.T) (*MigrateToPluginService, sec
raw, err := ini.Load([]byte(rawCfg)) raw, err := ini.Load([]byte(rawCfg))
require.NoError(t, err) require.NoError(t, err)
cfg := &setting.Cfg{Raw: raw} cfg := &setting.Cfg{Raw: raw}
sqlStore := db.InitTestDB(t)
// this would be the plugin - mocked at the moment // 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) 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 // this is to init the sql secret store inside the migration
sqlStore := db.InitTestDB(t)
secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore()) secretsService := secretsManager.SetupTestService(t, fakes.NewFakeSecretsStore())
manager := secretskvs.NewFakeSecretsPluginManager(t, false) manager := secretskvs.NewFakeSecretsPluginManager(t, false)
migratorService := ProvideMigrateToPluginService( migratorService := ProvideMigrateToPluginService(

4
pkg/services/secrets/kvstore/test_helpers.go
View File

@ -20,12 +20,12 @@ import (
"github.com/grafana/grafana/pkg/services/featuremgmt" "github.com/grafana/grafana/pkg/services/featuremgmt"
"github.com/grafana/grafana/pkg/services/secrets/fakes" "github.com/grafana/grafana/pkg/services/secrets/fakes"
secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager" secretsmng "github.com/grafana/grafana/pkg/services/secrets/manager"
"github.com/grafana/grafana/pkg/services/sqlstore"
"github.com/grafana/grafana/pkg/setting" "github.com/grafana/grafana/pkg/setting"
) )
func NewFakeSQLSecretsKVStore(t *testing.T) *SecretsKVStoreSQL { func NewFakeSQLSecretsKVStore(t *testing.T, sqlStore *sqlstore.SQLStore) *SecretsKVStoreSQL {
t.Helper() t.Helper()
sqlStore := db.InitTestDB(t)
secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore()) secretsService := secretsmng.SetupTestService(t, fakes.NewFakeSecretsStore())
return NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger")) return NewSQLSecretsKVStore(sqlStore, secretsService, log.New("test.logger"))
} }