IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix playlist tests (#92837)

Browse Source
This commit is contained in:
Claudiu Dragalina-Paraipan 2024-09-05 15:41:28 +03:00 committed by GitHub
parent 87f4df4bc3
commit 085aaec958
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/playlist/v0alpha1/register.go
View File

@ -15,7 +15,7 @@ const (
VERSION = "v0alpha1" VERSION = "v0alpha1"
APIVERSION = GROUP + "/" + VERSION APIVERSION = GROUP + "/" + VERSION
RESOURCE = "playlists" RESOURCE = "playlists"
GROUPRESOURCE = GROUP + "/" + RESOURCE RESOURCEGROUP = RESOURCE + "." + GROUP
) )
var PlaylistResourceInfo = utils.NewResourceInfo(GROUP, VERSION, var PlaylistResourceInfo = utils.NewResourceInfo(GROUP, VERSION,

22
pkg/tests/apis/playlist/playlist_test.go
View File

@ -94,7 +94,7 @@ func TestIntegrationPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
APIServerStorageType: "file", // write the files to disk APIServerStorageType: "file", // write the files to disk
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode0, DualWriterMode: grafanarest.Mode0,
}, },
}, },
@ -110,7 +110,7 @@ func TestIntegrationPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
APIServerStorageType: "file", // write the files to disk APIServerStorageType: "file", // write the files to disk
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode1, DualWriterMode: grafanarest.Mode1,
}, },
}, },
@ -126,7 +126,7 @@ func TestIntegrationPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
APIServerStorageType: "file", // write the files to disk APIServerStorageType: "file", // write the files to disk
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode2, DualWriterMode: grafanarest.Mode2,
}, },
}, },
@ -142,7 +142,7 @@ func TestIntegrationPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
APIServerStorageType: "file", // write the files to disk APIServerStorageType: "file", // write the files to disk
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode3, DualWriterMode: grafanarest.Mode3,
}, },
}, },
@ -161,7 +161,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode0, DualWriterMode: grafanarest.Mode0,
}, },
}, },
@ -186,7 +186,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode2, DualWriterMode: grafanarest.Mode2,
}, },
}, },
@ -202,7 +202,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode3, DualWriterMode: grafanarest.Mode3,
}, },
}, },
@ -218,7 +218,7 @@ func TestIntegrationPlaylist(t *testing.T) {
DisableAnonymous: true, DisableAnonymous: true,
APIServerStorageType: "etcd", // requires etcd running on localhost:2379 APIServerStorageType: "etcd", // requires etcd running on localhost:2379
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode0, DualWriterMode: grafanarest.Mode0,
}, },
}, },
@ -250,7 +250,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode1, DualWriterMode: grafanarest.Mode1,
}, },
}, },
@ -279,7 +279,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode2, DualWriterMode: grafanarest.Mode2,
}, },
}, },
@ -308,7 +308,7 @@ func TestIntegrationPlaylist(t *testing.T) {
featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written featuremgmt.FlagKubernetesPlaylists, // Required so that legacy calls are also written
}, },
UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{ UnifiedStorageConfig: map[string]setting.UnifiedStorageConfig{
playlistv0alpha1.GROUPRESOURCE: { playlistv0alpha1.RESOURCEGROUP: {
DualWriterMode: grafanarest.Mode3, DualWriterMode: grafanarest.Mode3,
}, },
}, },