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

* 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
@@ -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)