Move SkipIntegrationTestInShortMode to testutil. (#110750)

* Move SkipIntegrationTestInShortMode to testutil.

* make update-workspace

pkg/tests/apis/folder/folders_test.go

@@ -26,10 +26,10 @@ import (
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/tests"
 	"github.com/grafana/grafana/pkg/tests/apis"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
 	"github.com/grafana/grafana/pkg/tests/testsuite"
+	"github.com/grafana/grafana/pkg/util/testutil"
 )
 
 func TestMain(m *testing.M) {
@@ -1172,7 +1172,7 @@ func TestIntegrationFoldersGetAPIEndpointK8S(t *testing.T) {
 
 // Reproduces a bug where folder deletion does not check for attached library panels.
 func TestIntegrationFolderDeletionBlockedByLibraryElements(t *testing.T) {
-	tests.SkipIntegrationTestInShortMode(t)
+	testutil.SkipIntegrationTestInShortMode(t)
 
 	if !db.IsTestDbSQLite() {
 		t.Skip("test only on sqlite for now")
@@ -1251,7 +1251,7 @@ func TestIntegrationFolderDeletionBlockedByLibraryElements(t *testing.T) {
 }
 
 func TestIntegrationRootFolderDeletionBlockedByLibraryElementsInSubfolder(t *testing.T) {
-	tests.SkipIntegrationTestInShortMode(t)
+	testutil.SkipIntegrationTestInShortMode(t)
 
 	if !db.IsTestDbSQLite() {
 		t.Skip("test only on sqlite for now")

pkg/tests/utils.go

@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"net/url"
 	"os"
-	"strings"
 	"testing"
 
 	"github.com/go-openapi/strfmt"
@@ -25,16 +24,6 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 )
 
-func SkipIntegrationTestInShortMode(t testing.TB) {
-	t.Helper()
-	if !strings.HasPrefix(t.Name(), "TestIntegration") {
-		t.Fatal("test is not an integration test")
-	}
-	if testing.Short() {
-		t.Skip("skipping integration test in short mode")
-	}
-}
-
 func CreateUser(t *testing.T, db db.DB, cfg *setting.Cfg, cmd user.CreateUserCommand) int64 {
 	t.Helper()