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

sql: removed dependency on test-db-check (#78717)

Browse Source
This commit is contained in:
Gábor Farkas 2023-11-28 12:46:01 +01:00 committed by GitHub
parent 6e4418ffd2
commit 4f899e3576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/tsdb/grafana-postgresql-datasource/postgres_test.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"math/rand"
"os"
"strings"
"testing"
"time"
@ -14,7 +15,6 @@ import (
"github.com/stretchr/testify/require"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
@ -180,7 +180,7 @@ func TestIntegrationPostgres(t *testing.T) {
// change to true to run the PostgreSQL tests
const runPostgresTests = false
if !(db.IsTestDbPostgres() || runPostgresTests) {
if !(isTestDbPostgres() || runPostgresTests) {
t.Skip()
}
@ -1427,3 +1427,11 @@ type tlsTestManager struct {
func (m *tlsTestManager) getTLSSettings(dsInfo sqleng.DataSourceInfo) (tlsSettings, error) {
return m.settings, nil
}
func isTestDbPostgres() bool {
if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
return db == "postgres"
}
return false
}

12
pkg/tsdb/mysql/mysql_test.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"math/rand"
"os"
"strings"
"testing"
"time"
@ -13,7 +14,6 @@ import (
"github.com/stretchr/testify/require"
"xorm.io/xorm"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/grafana/grafana/pkg/services/sqlstore/sqlutil"
"github.com/grafana/grafana/pkg/setting"
"github.com/grafana/grafana/pkg/tsdb/sqleng"
@ -35,7 +35,7 @@ func TestIntegrationMySQL(t *testing.T) {
runMySQLTests := false
// runMySqlTests := true
if !(db.IsTestDbMySQL() || runMySQLTests) {
if !(isTestDbMySQL() || runMySQLTests) {
t.Skip()
}
@ -1321,3 +1321,11 @@ func genTimeRangeByInterval(from time.Time, duration time.Duration, interval tim
return timeRange
}
func isTestDbMySQL() bool {
if db, present := os.LookupEnv("GRAFANA_TEST_DB"); present {
return db == "mysql"
}
return false
}