From c4d89a7a09b94840af2974cfc0a0bfec5c51c9db Mon Sep 17 00:00:00 2001
From: Stephanie Hingtgen <stephanie.hingtgen@grafana.com>
Date: Tue, 16 Sep 2025 12:50:08 -0600
Subject: [PATCH] Provisioning: Add back most integration tests; skip flaky
 ones (#111197)

---
 pkg/tests/apis/provisioning/exportjob_test.go  | 3 +++
 pkg/tests/apis/provisioning/files_test.go      | 6 ++++++
 pkg/tests/apis/provisioning/helper_test.go     | 4 ++--
 pkg/tests/apis/provisioning/pulljob_test.go    | 3 +++
 pkg/tests/apis/provisioning/repository_test.go | 3 +++
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkg/tests/apis/provisioning/exportjob_test.go b/pkg/tests/apis/provisioning/exportjob_test.go
index 665accd84e2..2b3479bbc7b 100644
--- a/pkg/tests/apis/provisioning/exportjob_test.go
+++ b/pkg/tests/apis/provisioning/exportjob_test.go
@@ -17,6 +17,9 @@ import (
 )
 
 func TestIntegrationProvisioning_ExportUnifiedToRepository(t *testing.T) {
+	// TODO: fix flaky test
+	t.Skip("skipping flaky test")
+
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	helper := runGrafana(t)
diff --git a/pkg/tests/apis/provisioning/files_test.go b/pkg/tests/apis/provisioning/files_test.go
index 41aad60fd6c..b5acfcddb54 100644
--- a/pkg/tests/apis/provisioning/files_test.go
+++ b/pkg/tests/apis/provisioning/files_test.go
@@ -109,6 +109,9 @@ func TestIntegrationProvisioning_DeleteResources(t *testing.T) {
 }
 
 func TestIntegrationProvisioning_MoveResources(t *testing.T) {
+	// TODO: fix flaky test
+	t.Skip("skipping flaky test")
+
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	helper := runGrafana(t)
@@ -399,6 +402,9 @@ func TestIntegrationProvisioning_MoveResources(t *testing.T) {
 }
 
 func TestIntegrationProvisioning_FilesOwnershipProtection(t *testing.T) {
+	// TODO: fix flaky test
+	t.Skip("skipping flaky test")
+
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	helper := runGrafana(t)
diff --git a/pkg/tests/apis/provisioning/helper_test.go b/pkg/tests/apis/provisioning/helper_test.go
index 857c7c1c595..3ba1c7e7604 100644
--- a/pkg/tests/apis/provisioning/helper_test.go
+++ b/pkg/tests/apis/provisioning/helper_test.go
@@ -36,11 +36,11 @@ import (
 	"github.com/grafana/grafana/pkg/setting"
 	"github.com/grafana/grafana/pkg/tests/apis"
 	"github.com/grafana/grafana/pkg/tests/testinfra"
+	"github.com/grafana/grafana/pkg/tests/testsuite"
 )
 
 func TestMain(m *testing.M) {
-	// TODO: Tests are flaky, so skip them for now
-	//testsuite.Run(m)
+	testsuite.Run(m)
 }
 
 type provisioningTestHelper struct {
diff --git a/pkg/tests/apis/provisioning/pulljob_test.go b/pkg/tests/apis/provisioning/pulljob_test.go
index 0b9387e900a..dc0e3ee3f66 100644
--- a/pkg/tests/apis/provisioning/pulljob_test.go
+++ b/pkg/tests/apis/provisioning/pulljob_test.go
@@ -19,6 +19,9 @@ import (
 )
 
 func TestIntegrationProvisioning_PullJobOwnershipProtection(t *testing.T) {
+	// TODO: fix flaky test
+	t.Skip("skipping flaky test")
+
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	helper := runGrafana(t)
diff --git a/pkg/tests/apis/provisioning/repository_test.go b/pkg/tests/apis/provisioning/repository_test.go
index 8d3e7daa089..eab641c9e03 100644
--- a/pkg/tests/apis/provisioning/repository_test.go
+++ b/pkg/tests/apis/provisioning/repository_test.go
@@ -382,6 +382,9 @@ func TestIntegrationProvisioning_CreatingGitHubRepository(t *testing.T) {
 }
 
 func TestIntegrationProvisioning_RepositoryLimits(t *testing.T) {
+	// TODO: fix flaky test
+	t.Skip("skipping flaky test")
+
 	testutil.SkipIntegrationTestInShortMode(t)
 
 	helper := runGrafana(t)