Run generate tests on a specific instance

Author: julienduchesne

.github/workflows/acc-tests.yml

@@ -55,7 +55,7 @@ jobs:
         # OSS tests, run on all versions
         version: ['11.0.0', '10.4.3', '9.5.18']
         type: ['oss']
-        subset: ['basic', 'other', 'long', 'generate']
+        subset: ['basic', 'other', 'long']
         include:
           - version: '11.0.0'
             type: 'oss'
@@ -74,13 +74,20 @@ jobs:
           # Enterprise tests
           - version: '11.0.0'
             type: 'enterprise'
-            subset: 'all'
+            subset: 'enterprise'
           - version: '10.4.3'
             type: 'enterprise'
-            subset: 'all'
+            subset: 'enterprise'
           - version: '9.5.18'
             type: 'enterprise'
-            subset: 'all'
+            subset: 'enterprise'
+          # Generate tests
+          - version: '11.0.0'
+            type: 'enterprise'
+            subset: 'generate'
+          - version: '10.4.3'
+            type: 'enterprise'
+            subset: 'generate'
     name: ${{ matrix.version }} - ${{ matrix.type }} - ${{ matrix.subset }}
     runs-on: ubuntu-latest
     steps:
@@ -103,7 +110,7 @@ jobs:
         env:
           GRAFANA_VERSION: ${{ matrix.version }}
           TESTARGS: >- 
-            ${{ matrix.subset == 'all' && '-parallel 2' || '' }}
+            ${{ matrix.subset == 'enterprise' && '-skip="TestAccGenerate" -parallel 2' || '' }}
             ${{ matrix.subset == 'basic' && '-run=".*_basic" -short -parallel 2' || '' }}
             ${{ matrix.subset == 'other' && '-skip=".*_basic" -short -parallel 2' || '' }}
             ${{ matrix.subset == 'long' && '-run=".*longtest" -parallel 1' || '' }}

pkg/generate/generate_test.go

@@ -6,7 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/grafana/grafana-openapi-client-go/client/access_control"
 	"github.com/grafana/grafana-openapi-client-go/client/service_accounts"
@@ -23,10 +22,7 @@ import (
 )
 
 func TestAccGenerate(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping long test")
-	}
-	testutils.CheckOSSTestsEnabled(t)
+	testutils.CheckEnterpriseTestsEnabled(t, ">=10.0.0")
 
 	// Install Terraform to a temporary directory to avoid reinstalling it for each test case.
 	installDir := t.TempDir()
@@ -235,9 +231,6 @@ func TestAccGenerate(t *testing.T) {
 }
 
 func TestAccGenerate_RestrictedPermissions(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping long test")
-	}
 	testutils.CheckEnterpriseTestsEnabled(t, ">=10.0.0")
 
 	// Create SA with no permissions
@@ -289,8 +282,6 @@ func TestAccGenerate_RestrictedPermissions(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	time.Sleep(5 * time.Second) // Wait for permissions to propagate
-
 	resource.Test(t, resource.TestCase{
 		ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{