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

Remove support for Google Spanner database. (#105846)

Browse Source 
* Remove support for Google Spanner database.
This commit is contained in:
Peter Štibraný
2025-05-23 11:35:59 +02:00
committed by GitHub
parent 9769871a88
commit c4d3eb1cd0
50 changed files with 26 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/api/alerting/api_testing_test.go
+1 -1
View File
@@ -33,7 +33,7 @@ const (
)
func TestMain(m *testing.M) {
testsuite.RunButSkipOnSpanner(m)
testsuite.Run(m)
}
func TestGrafanaRuleConfig(t *testing.T) {
pkg/tests/apis/alerting/notifications/receivers/receiver_test.go
+1 -1
View File
@@ -54,7 +54,7 @@ import (
var testData embed.FS
func TestMain(m *testing.M) {
testsuite.RunButSkipOnSpanner(m)
testsuite.Run(m)
}
func getTestHelper(t *testing.T) *apis.K8sTestHelper {
pkg/tests/apis/alerting/notifications/routingtree/routing_tree_test.go
+1 -1
View File
@@ -39,7 +39,7 @@ import (
)
func TestMain(m *testing.M) {
testsuite.RunButSkipOnSpanner(m)
testsuite.Run(m)
}
func getTestHelper(t *testing.T) *apis.K8sTestHelper {
pkg/tests/apis/alerting/notifications/templategroup/templates_group_test.go
+1 -1
View File
@@ -32,7 +32,7 @@ import (
)
func TestMain(m *testing.M) {
testsuite.RunButSkipOnSpanner(m)
testsuite.Run(m)
}
func getTestHelper(t *testing.T) *apis.K8sTestHelper {
pkg/tests/apis/alerting/notifications/timeinterval/timeinterval_test.go
+1 -1
View File
@@ -44,7 +44,7 @@ import (
var testData embed.FS
func TestMain(m *testing.M) {
testsuite.RunButSkipOnSpanner(m)
testsuite.Run(m)
}
func getTestHelper(t *testing.T) *apis.K8sTestHelper {
pkg/tests/testinfra/testinfra.go
+3 -10
View File
@@ -18,6 +18,7 @@ import (
"gopkg.in/ini.v1"
"github.com/grafana/dskit/kv"
"github.com/grafana/grafana/pkg/api"
"github.com/grafana/grafana/pkg/extensions"
"github.com/grafana/grafana/pkg/infra/db"
@@ -508,17 +509,9 @@ func CreateGrafDir(t *testing.T, opts GrafanaOpts) (string, string) {
require.NoError(t, err)
_, err = dbSection.NewKey("query_retries", fmt.Sprintf("%d", queryRetries))
require.NoError(t, err)
if db.IsTestDBSpanner() {
_, err = dbSection.NewKey("max_open_conn", "20")
} else {
_, err = dbSection.NewKey("max_open_conn", "2")
}
_, err = dbSection.NewKey("max_open_conn", "2")
require.NoError(t, err)
if db.IsTestDBSpanner() {
_, err = dbSection.NewKey("max_idle_conn", "20")
} else {
_, err = dbSection.NewKey("max_idle_conn", "2")
}
_, err = dbSection.NewKey("max_idle_conn", "2")
require.NoError(t, err)
cfgPath := filepath.Join(cfgDir, "test.ini")
pkg/tests/testsuite/testsuite.go
-5
View File
@@ -13,8 +13,3 @@ func Run(m *testing.M) {
db.CleanupTestDB()
os.Exit(code)
}
func RunButSkipOnSpanner(m *testing.M) {
db.SkipTestsOnSpanner()
Run(m)
}