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

Change testing.Short() check with SkipIntegrationTestInShortMode check. (#112442)

Browse Source 
* Change testing.Short() check with SkipIntegrationTestInShortMode check.
This commit is contained in:
Peter Štibraný
2025-10-20 09:40:38 +02:00
committed by GitHub
parent 891d5f0625
commit 7604653fd8
8 changed files with 26 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/apikey/apikeyimpl/store_test.go
-3
View File
@@ -56,9 +56,6 @@ func seedApiKeys(t *testing.T, store store, num int) {
}
func testIntegrationApiKeyDataAccess(t *testing.T, fn getStore) {
if testing.Short() {
t.Skip("skipping integration test")
}
t.Helper()
mockTimeNow()
pkg/tests/apis/alerting/rules/alertrule/alertrule_test.go
+6 -15
View File
@@ -18,6 +18,7 @@ import (
"github.com/grafana/grafana/pkg/tests/apis/alerting/rules/common"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/testutil"
prom_model "github.com/prometheus/common/model"
)
@@ -26,9 +27,7 @@ func TestMain(m *testing.M) {
}
func TestIntegrationResourceIdentifier(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -124,9 +123,7 @@ func TestIntegrationResourcePermissions(t *testing.T) {
// TestIntegrationAccessControl tests basic access control functionality
// Access control is primarily handled in the service layer, so this test focuses on basic CRUD operations
func TestIntegrationAccessControl(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -208,9 +205,7 @@ func TestIntegrationAccessControl(t *testing.T) {
}
func TestIntegrationCRUD(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -472,9 +467,7 @@ func TestIntegrationCRUD(t *testing.T) {
}
func TestIntegrationPatch(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -551,9 +544,7 @@ func TestIntegrationPatch(t *testing.T) {
}
func TestIntegrationBasicAPI(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
pkg/tests/apis/alerting/rules/compat/alertrule_test.go
+4 -9
View File
@@ -13,15 +13,14 @@ import (
"github.com/grafana/grafana/pkg/tests/api/alerting"
"github.com/grafana/grafana/pkg/tests/apis/alerting/rules/common"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/testutil"
prom_model "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
func TestIntegrationAlertRuleCompatCreateViaK8s(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -145,9 +144,7 @@ func TestIntegrationAlertRuleCompatCreateViaK8s(t *testing.T) {
}
func TestIntegrationAlertRuleCompatCreateViaProvisioning(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -287,9 +284,7 @@ func TestIntegrationAlertRuleCompatCreateViaProvisioning(t *testing.T) {
}
func TestIntegrationAlertRuleCompatCreateViaProvisioningChangeGroupInK8s(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
pkg/tests/apis/alerting/rules/compat/recordingrule_test.go
+4 -9
View File
@@ -14,6 +14,7 @@ import (
"github.com/grafana/grafana/pkg/tests/apis/alerting/rules/common"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/testutil"
prom_model "github.com/prometheus/common/model"
"github.com/stretchr/testify/require"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -24,9 +25,7 @@ func TestMain(m *testing.M) {
}
func TestIntegrationRecordingRuleCompatCreateViaK8s(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -152,9 +151,7 @@ func TestIntegrationRecordingRuleCompatCreateViaK8s(t *testing.T) {
}
func TestIntegrationRecordingRuleCompatCreateViaProvisioning(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -296,9 +293,7 @@ func TestIntegrationRecordingRuleCompatCreateViaProvisioning(t *testing.T) {
}
func TestIntegrationRecordingRuleCompatCreateViaProvisioningChangeGroupInK8s(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
pkg/tests/apis/alerting/rules/recordingrule/recordingrule_test.go
+6 -15
View File
@@ -17,6 +17,7 @@ import (
"github.com/grafana/grafana/pkg/tests/apis/alerting/rules/common"
"github.com/grafana/grafana/pkg/tests/testsuite"
"github.com/grafana/grafana/pkg/util"
"github.com/grafana/grafana/pkg/util/testutil"
prom_model "github.com/prometheus/common/model"
)
@@ -25,9 +26,7 @@ func TestMain(m *testing.M) {
}
func TestIntegrationResourceIdentifier(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -123,9 +122,7 @@ func TestIntegrationResourcePermissions(t *testing.T) {
// TestIntegrationAccessControl tests basic access control functionality
// Access control is primarily handled in the service layer, so this test focuses on basic CRUD operations
func TestIntegrationAccessControl(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -207,9 +204,7 @@ func TestIntegrationAccessControl(t *testing.T) {
}
func TestIntegrationCRUD(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -465,9 +460,7 @@ func TestIntegrationCRUD(t *testing.T) {
}
func TestIntegrationPatch(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
@@ -544,9 +537,7 @@ func TestIntegrationPatch(t *testing.T) {
}
func TestIntegrationBasicAPI(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test")
}
testutil.SkipIntegrationTestInShortMode(t)
ctx := context.Background()
helper := common.GetTestHelper(t)
pkg/tsdb/grafana-postgresql-datasource/postgres_pgx_snapshot_test.go
+3 -4
View File
@@ -17,6 +17,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/grafana/grafana/pkg/tsdb/grafana-postgresql-datasource/sqleng"
"github.com/grafana/grafana/pkg/util/testutil"
)
// These tests require a real postgres database:
@@ -28,12 +29,10 @@ import (
// Use the docker/blocks/postgres_tests/docker-compose.yaml to spin up a
// preconfigured Postgres server suitable for running these tests.
func TestIntegrationPostgresPGXSnapshots(t *testing.T) {
testutil.SkipIntegrationTestInShortMode(t)
// the logic in this function is copied from postgres_tests.go
shouldRunTest := func() bool {
if testing.Short() {
return false
}
testDbName, present := os.LookupEnv("GRAFANA_TEST_DB")
if present && testDbName == "postgres" {
pkg/tsdb/grafana-postgresql-datasource/postgres_snapshot_test.go
-4
View File
@@ -35,10 +35,6 @@ func TestIntegrationPostgresSnapshots(t *testing.T) {
// the logic in this function is copied from postgres_tests.go
shouldRunTest := func() bool {
if testing.Short() {
return false
}
testDbName, present := os.LookupEnv("GRAFANA_TEST_DB")
if present && testDbName == "postgres" {
pkg/tsdb/influxdb/fsql/fsql_test.go
+3 -3
View File
@@ -17,6 +17,7 @@ import (
"github.com/stretchr/testify/suite"
"github.com/grafana/grafana/pkg/tsdb/influxdb/models"
"github.com/grafana/grafana/pkg/util/testutil"
)
type FSQLTestSuite struct {
@@ -56,9 +57,8 @@ func (suite *FSQLTestSuite) AfterTest(suiteName, testName string) {
}
func TestIntegrationFSQLTestSuite(t *testing.T) {
if testing.Short() {
t.Skip("skipping integration test in short mode")
}
testutil.SkipIntegrationTestInShortMode(t)
suite.Run(t, new(FSQLTestSuite))
}