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

Unified Storage: Dont need to test casing with ordering (#110245)

Browse Source 
Dont need to test casing with ordering.
This commit is contained in:
owensmallwood
2025-08-27 14:06:43 -06:00
committed by GitHub
parent 541e378891
commit 699bffc9e4
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/unified/testing/storage_backend.go
+5 -12
View File
@@ -11,7 +11,6 @@ import (
"github.com/go-jose/go-jose/v3/jwt"
"github.com/google/uuid"
"github.com/grafana/grafana/pkg/infra/db"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -556,28 +555,22 @@ func runTestIntegrationBackendListModifiedSince(t *testing.T, backend resource.S
})
t.Run("will order events by resource version ascending and name descending", func(t *testing.T) {
// When we order by name ASC, sqlite orders upper case strings first - so skipping for sqlite
// For example: for this test, the actual ordering of events for sqlite is CItem, aItem, bItem
if db.IsTestDbSQLite() {
t.Skip("Skipping test for sqlite since ordering by name is different than mysql due to case sensitivity")
}
key := resource.NamespacedResource{
Namespace: ns,
Group: "group",
Resource: "resource",
}
rvCreated1, _ := writeEvent(ctx, backend, "aItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
rvCreated2, _ := writeEvent(ctx, backend, "bItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
rvCreated3, _ := writeEvent(ctx, backend, "CItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
rvCreated1, _ := writeEvent(ctx, backend, "cItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
rvCreated2, _ := writeEvent(ctx, backend, "aItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
rvCreated3, _ := writeEvent(ctx, backend, "bItem", resourcepb.WatchEvent_ADDED, WithNamespace(ns))
latestRv, seq := backend.ListModifiedSince(ctx, key, rvCreated1-1)
require.Greater(t, latestRv, rvCreated3)
counter := 0
names := []string{"aItem", "bItem", "CItem"}
rvs := []int64{rvCreated1, rvCreated2, rvCreated3}
names := []string{"aItem", "bItem", "cItem"}
rvs := []int64{rvCreated2, rvCreated3, rvCreated1}
for res, err := range seq {
require.NoError(t, err)
require.Equal(t, key.Namespace, res.Key.Namespace)