TestAccDatasourceRole_basic: ParallelTest -> Test

Author: alexander-akhmetov

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: "3"
 services:
   mysql:
     ports:
@@ -30,7 +30,7 @@ services:
       - GF_SERVER_ROOT_URL=${GRAFANA_URL}
       - GF_ENTERPRISE_LICENSE_TEXT=${GF_ENTERPRISE_LICENSE_TEXT:-}
       - GF_SERVER_SERVE_FROM_SUB_PATH=${GF_SERVER_SERVE_FROM_SUB_PATH:-}
-      - GF_FEATURE_TOGGLES_ENABLE=nestedFolders
+      - GF_FEATURE_TOGGLES_ENABLE=nestedFolders,ssoSettingsApi,ssoSettingsSAML,ssoSettingsLDAP
     healthcheck:
       test: wget --no-verbose --tries=1 --spider http://0.0.0.0:3000/api/health || exit 1 # Use wget because older versions of Grafana don't have curl
       interval: 10s

internal/resources/grafana/data_source_role_test.go

@@ -23,7 +23,7 @@ func TestAccDatasourceRole_basic(t *testing.T) {
 				})
 			}
 
-			resource.ParallelTest(t, resource.TestCase{
+			resource.Test(t, resource.TestCase{
 				ProtoV5ProviderFactories: testutils.ProtoV5ProviderFactories,
 				CheckDestroy:             roleCheckExists.destroyed(&role, nil),
 				Steps: []resource.TestStep{

internal/resources/grafana/resource_sso_settings_test.go

@@ -64,7 +64,7 @@ func TestSSOSettings_basic_oauth2(t *testing.T) {
 }
 
 func TestSSOSettings_basic_saml(t *testing.T) {
-	testutils.CheckEnterpriseTestsEnabled(t, ">=12.0")
+	testutils.CheckEnterpriseTestsEnabled(t, ">=11.1")
 
 	provider := "saml"
 
@@ -136,10 +136,7 @@ func TestSSOSettings_basic_saml(t *testing.T) {
 }
 
 func TestSSOSettings_basic_ldap(t *testing.T) {
-	// The version requirement was 11.3, but  the LDAP provider requires some additional settings without
-	// which the API fails with `failed to fetch the default settings for provider ldap`.
-	// Incremented the version for now to skip the test, once it's fixed it can be downgraded again.
-	testutils.CheckOSSTestsEnabled(t, ">=12.0")
+	testutils.CheckOSSTestsEnabled(t, ">=11.3")
 
 	provider := "ldap"