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

Provisioning: Fix flaky move files test (#109116)

Browse Source 
* Fix flaky move files test
* Use assert within Eventually
This commit is contained in:
Roberto Jiménez Sánchez
2025-08-04 15:47:12 +00:00
committed by GitHub
parent 990f1c69ec
commit 63787c276b
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/tests/apis/provisioning/provisioning_test.go
+18 -16
View File
@@ -1378,27 +1378,29 @@ func TestIntegrationProvisioning_MoveJob(t *testing.T) {
require.Error(t, err, "original file should be gone from repository")
require.True(t, apierrors.IsNotFound(err), "should be not found error")
// Verify dashboard still exists in Grafana after sync
dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
require.NoError(t, err)
require.Len(t, dashboards.Items, 3, "should still have 3 dashboards after move")
// Verify that dashboards have the correct source paths
foundPaths := make(map[string]bool)
for _, dashboard := range dashboards.Items {
sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
foundPaths[sourcePath] = true
}
require.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
require.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
require.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
// Verify other files still exist at original locations
_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "dashboard2.json")
require.NoError(t, err, "other files should still exist")
_, err = helper.Repositories.Resource.Get(ctx, repo, metav1.GetOptions{}, "files", "folder", "dashboard3.json")
require.NoError(t, err, "nested files should still exist")
// Verify dashboard still exists in Grafana after sync
// Use eventually to let unified storage reflect the changes in dashboards.
require.EventuallyWithT(t, func(collect *assert.CollectT) {
dashboards, err := helper.DashboardsV1.Resource.List(ctx, metav1.ListOptions{})
assert.NoError(collect, err)
assert.Len(collect, dashboards.Items, 3, "should still have 3 dashboards after move")
// Verify that dashboards have the correct source paths
foundPaths := make(map[string]bool)
for _, dashboard := range dashboards.Items {
sourcePath := dashboard.GetAnnotations()["grafana.app/sourcePath"]
foundPaths[sourcePath] = true
}
assert.True(t, foundPaths["moved/dashboard1.json"], "should have dashboard with moved source path")
assert.True(t, foundPaths["dashboard2.json"], "should have dashboard2 in original location")
assert.True(t, foundPaths["folder/dashboard3.json"], "should have dashboard3 in original nested location")
}, time.Second*10, time.Millisecond*100, "Expected to eventually have 3 dashboards after move")
})
t.Run("move multiple files and folder", func(t *testing.T) {