Skip to content

Commit a5c92f6

Browse files
Skip TestAccPlaylist_basic
1 parent f604e30 commit a5c92f6

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

internal/resources/examples_test.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,26 @@ func TestAccExamples(t *testing.T) {
3232
testutils.CheckOSSTestsEnabled(t, ">=11.0.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config.
3333
},
3434
},
35+
{
36+
category: "Grafana OSS >=10.4.0 <=11.0.0 playlists",
37+
testCheck: func(t *testing.T, filename string) {
38+
if strings.Contains(filename, "grafana_playlist") {
39+
testutils.CheckOSSTestsEnabled(t, ">=10.4.0,<=11.0.0")
40+
}
41+
},
42+
},
3543
{
3644
category: "Grafana OSS",
3745
testCheck: func(t *testing.T, filename string) {
3846
if strings.Contains(filename, "sso_settings") {
3947
t.Skip() // TODO: Fix the tests to run on local instances
40-
} else {
41-
testutils.CheckOSSTestsEnabled(t, ">=11.0.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config.
4248
}
49+
if strings.Contains(filename, "grafana_playlist") {
50+
// Breaks after Grafana 11.0.0
51+
t.Skip()
52+
}
53+
54+
testutils.CheckOSSTestsEnabled(t, ">=11.6.0") // Only run on latest OSS version. The examples should be updated to reflect their latest working config.
4355
},
4456
},
4557
{

internal/resources/grafana/resource_playlist_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
const paylistResource = "grafana_playlist.test"
1616

1717
func TestAccPlaylist_basic(t *testing.T) {
18-
testutils.CheckOSSTestsEnabled(t)
18+
testutils.CheckOSSTestsEnabled(t, "<=11.0.0")
1919

2020
rName := acctest.RandomWithPrefix("tf-acc-test")
2121
var playlist models.Playlist
@@ -52,7 +52,7 @@ func TestAccPlaylist_basic(t *testing.T) {
5252
}
5353

5454
func TestAccPlaylist_update(t *testing.T) {
55-
testutils.CheckOSSTestsEnabled(t)
55+
testutils.CheckOSSTestsEnabled(t, "<=11.0.0")
5656

5757
rName := acctest.RandomWithPrefix("tf-acc-test")
5858
updatedName := "updated name"
@@ -128,7 +128,7 @@ func TestAccPlaylist_update(t *testing.T) {
128128
}
129129

130130
func TestAccPlaylist_disappears(t *testing.T) {
131-
testutils.CheckOSSTestsEnabled(t)
131+
testutils.CheckOSSTestsEnabled(t, "<=11.0.0")
132132

133133
rName := acctest.RandomWithPrefix("tf-acc-test")
134134
var playlist models.Playlist
@@ -150,7 +150,7 @@ func TestAccPlaylist_disappears(t *testing.T) {
150150
}
151151

152152
func TestAccPlaylist_inOrg(t *testing.T) {
153-
testutils.CheckOSSTestsEnabled(t, ">=9.0.0") // Querying org-specific playlists is broken pre-9
153+
testutils.CheckOSSTestsEnabled(t, ">=9.0.0,<=11.0.0") // Querying org-specific playlists is broken pre-9
154154

155155
rName := acctest.RandomWithPrefix("tf-acc-test")
156156
var org models.OrgDetailsDTO

0 commit comments

Comments
 (0)