fix: run provider tests in parallel

Also skip provider tests if -short flag is used.
juju · Jul 4, 2024 · 8151962 · 8151962
1 parent a14a1ed
commit 8151962
Show file tree

Hide file tree

Showing 17 changed files with 247 additions and 2 deletions.
diff --git a/internal/provider/data_source_machine_test.go b/internal/provider/data_source_machine_test.go
@@ -15,6 +15,11 @@ func TestAcc_DataSourceMachine_Edge(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-machine-test-model")
 
 	resource.Test(t, resource.TestCase{
@@ -35,6 +40,11 @@ func TestAcc_DataSourceMachine_Stable(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-machine-test-model")
 
 	resource.Test(t, resource.TestCase{

diff --git a/internal/provider/data_source_model_test.go b/internal/provider/data_source_model_test.go
@@ -12,6 +12,11 @@ import (
 )
 
 func TestAcc_DataSourceModel_Edge(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-model-test")
 
 	resource.Test(t, resource.TestCase{
@@ -30,6 +35,11 @@ func TestAcc_DataSourceModel_Edge(t *testing.T) {
 }
 
 func TestAcc_DataSourceModel_Stable(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-model-test")
 
 	resource.Test(t, resource.TestCase{

diff --git a/internal/provider/data_source_offer_test.go b/internal/provider/data_source_offer_test.go
@@ -12,6 +12,11 @@ import (
 )
 
 func TestAcc_DataSourceOffer(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-offer-test-model")
 	// ...-test-[0-9]+ is not a valid offer name, need to remove the dash before numbers
 	offerName := fmt.Sprintf("tf-datasource-offer-test%d", acctest.RandInt())
@@ -32,6 +37,11 @@ func TestAcc_DataSourceOffer(t *testing.T) {
 }
 
 func TestAcc_DataSourceOffer_UpgradeProvider(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-datasource-offer-test-model")
 	// ...-test-[0-9]+ is not a valid offer name, need to remove the dash before numbers
 	offerName := fmt.Sprintf("tf-datasource-offer-test%d", acctest.RandInt())

diff --git a/internal/provider/data_source_secrets_test.go b/internal/provider/data_source_secrets_test.go
@@ -18,6 +18,11 @@ import (
 // blocked on the lack of schema for secret access.
 
 func TestAcc_DataSourceSecret(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	version := os.Getenv("JUJU_AGENT_VERSION")
 	if version == "" || internaltesting.CompareVersions(version, "3.3.0") < 0 {
 		t.Skip("JUJU_AGENT_VERSION is not set or is below 3.3.0")

diff --git a/internal/provider/main_test.go b/internal/provider/main_test.go
@@ -7,7 +7,7 @@ package provider
 // in the testing phase.
 
 import (
-	"errors"
+	"fmt"
 	"net"
 	"os"
 	"strings"
@@ -59,7 +59,7 @@ func TypeTestingCloudFromString(from string) (CloudTesting, error) {
 	case string(MicroK8sTesting):
 		return MicroK8sTesting, nil
 	default:
-		return "", errors.New("unknown cloud type")
+		return "", fmt.Errorf("unknown cloud type %q", from)
 	}
 }
 

diff --git a/internal/provider/resource_access_model_test.go b/internal/provider/resource_access_model_test.go
@@ -13,6 +13,11 @@ import (
 )
 
 func TestAcc_ResourceAccessModel(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	userName := acctest.RandomWithPrefix("tfuser")
 	userPassword := acctest.RandomWithPrefix("tf-test-user")
 	userName2 := acctest.RandomWithPrefix("tfuser")
@@ -70,6 +75,10 @@ func TestAcc_ResourceAccessModel_UpgradeProvider(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
 
 	userName := acctest.RandomWithPrefix("tfuser")
 	userPassword := acctest.RandomWithPrefix("tf-test-user")

diff --git a/internal/provider/resource_access_secret_test.go b/internal/provider/resource_access_secret_test.go
@@ -18,6 +18,11 @@ import (
 // the applications used don't actually require a user secret.
 // TODO(anvial): Add a test that uses a secret that is actually required by the application.
 func TestAcc_ResourceAccessSecret_GrantRevoke(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	agentVersion := os.Getenv(TestJujuAgentVersion)
 	if agentVersion == "" {
 		t.Errorf("%s is not set", TestJujuAgentVersion)
@@ -58,6 +63,11 @@ func TestAcc_ResourceAccessSecret_GrantRevoke(t *testing.T) {
 }
 
 func TestAcc_ResourceAccessSecret_Import(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	agentVersion := os.Getenv(TestJujuAgentVersion)
 	if agentVersion == "" {
 		t.Errorf("%s is not set", TestJujuAgentVersion)

diff --git a/internal/provider/resource_application_test.go b/internal/provider/resource_application_test.go
@@ -25,6 +25,11 @@ import (
 )
 
 func TestAcc_ResourceApplication(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application")
 	appName := "test-app"
 
@@ -90,6 +95,11 @@ func TestAcc_ResourceApplication(t *testing.T) {
 }
 
 func TestAcc_ResourceApplication_Updates(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application")
 	appName := "jameinel-ubuntu-lite"
 	if testingCloud != LXDCloudTesting {
@@ -162,6 +172,10 @@ func TestAcc_ResourceApplication_UpdatesRevisionConfig(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
 
 	modelName := acctest.RandomWithPrefix("tf-test-application")
 	appName := "github-runner"
@@ -192,6 +206,11 @@ func TestAcc_ResourceApplication_UpdatesRevisionConfig(t *testing.T) {
 }
 
 func TestAcc_CharmUpdates(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-charmupdates")
 
 	resource.Test(t, resource.TestCase{
@@ -226,6 +245,11 @@ func TestAcc_ResourceRevisionUpdatesLXD(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-resource-revision-updates-lxd")
 
 	resource.Test(t, resource.TestCase{
@@ -260,6 +284,11 @@ func TestAcc_ResourceRevisionAddedToPlanLXD(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-resource-revision-updates-lxd")
 
 	resource.Test(t, resource.TestCase{
@@ -286,6 +315,11 @@ func TestAcc_ResourceRevisionRemovedFromPlanLXD(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-resource-revision-updates-lxd")
 
 	resource.Test(t, resource.TestCase{
@@ -314,6 +348,11 @@ func TestAcc_ResourceRevisionUpdatesMicrok8s(t *testing.T) {
 	if testingCloud != MicroK8sTesting {
 		t.Skip(t.Name() + " only runs with Microk8s")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-resource-revision-updates-microk8s")
 
 	resource.Test(t, resource.TestCase{
@@ -345,6 +384,11 @@ func TestAcc_ResourceRevisionUpdatesMicrok8s(t *testing.T) {
 }
 
 func TestAcc_ResourceApplication_Minimal(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application")
 	var charmName string
 	if testingCloud == LXDCloudTesting {
@@ -382,6 +426,11 @@ func TestAcc_ResourceApplication_Minimal(t *testing.T) {
 }
 
 func TestAcc_ResourceApplication_UpgradeProvider(t *testing.T) {
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application")
 	appName := "test-app"
 
@@ -419,6 +468,11 @@ func TestAcc_ResourceApplication_EndpointBindings(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application-bindings")
 	appName := "test-app"
 
@@ -454,6 +508,11 @@ func TestAcc_ResourceApplication_UpdateEndpointBindings(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-application-bindings-update")
 	appName := "test-app-update"
 

diff --git a/internal/provider/resource_credential_test.go b/internal/provider/resource_credential_test.go
@@ -15,6 +15,11 @@ func TestAcc_ResourceCredential(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	credentialName := acctest.RandomWithPrefix("tf-test-credential")
 	authType := "certificate"
 	token := "123abc"
@@ -57,6 +62,11 @@ func TestAcc_ResourceCredential_UpgradeProvider(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	credentialName := acctest.RandomWithPrefix("tf-test-credential")
 	authType := "certificate"
 

diff --git a/internal/provider/resource_integration_test.go b/internal/provider/resource_integration_test.go
@@ -17,6 +17,11 @@ func TestAcc_ResourceIntegration(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-integration")
 
 	resource.Test(t, resource.TestCase{
@@ -54,6 +59,11 @@ func TestAcc_ResourceIntegrationWithViaCIDRs(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	srcModelName := acctest.RandomWithPrefix("tf-test-integration")
 	dstModelName := acctest.RandomWithPrefix("tf-test-integration-dst")
 	via := "127.0.0.1/32,127.0.0.3/32"
@@ -81,6 +91,11 @@ func TestAcc_ResourceIntegration_UpgradeProvider(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	modelName := acctest.RandomWithPrefix("tf-test-integration")
 
 	resource.Test(t, resource.TestCase{
@@ -216,6 +231,11 @@ func TestAcc_ResourceIntegrationWithMultipleConsumers(t *testing.T) {
 	if testingCloud != LXDCloudTesting {
 		t.Skip(t.Name() + " only runs with LXD")
 	}
+	if testing.Short() {
+		t.Skip()
+	}
+	t.Parallel()
+
 	srcModelName := acctest.RandomWithPrefix("tf-test-integration")
 	dstModelName := acctest.RandomWithPrefix("tf-test-integration-dst")