[ignore] Use dependency in failing test to avoid data race condition.

CiscoDevNet · May 22, 2024 · 8065077 · 8065077
1 parent f118801
commit 8065077
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -76,9 +76,7 @@ jobs:
           terraform_version: '1.7.*'
           terraform_wrapper: false
       - name: Terraform Acceptance Test (APIC ${{ matrix.apic_host.name }})
-        # TODO: Fix TestAccAciRestManaged_importWithIpv6 to resolve data race failures occurring in the CI
-        # https://github.com/CiscoDevNet/terraform-provider-aci/issues/1218
-        run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -race -timeout 300m -coverprofile=coverage.out -covermode=atomic -skip TestAccAciRestManaged_importWithIpv6
+        run: go test github.com/CiscoDevNet/terraform-provider-aci/v2/internal/provider -v -race -timeout 300m -coverprofile=coverage.out -covermode=atomic
         env:
           TF_ACC: '1'
           TF_ACC_STATE_LINEAGE: '1'

diff --git a/internal/provider/resource_aci_rest_managed_test.go b/internal/provider/resource_aci_rest_managed_test.go
@@ -909,6 +909,12 @@ func testAccAciRestManagedConfig_importWithIpv6(name string, resource string, ip
 	}
 
 	resource "aci_rest_managed" "bd_%[2]s_2" {
+		# TODO: Fix TestAccAciRestManaged_importWithIpv6 to resolve data race failures occurring in the CI
+		# Remove this dependency when fixed.
+        # https://github.com/CiscoDevNet/terraform-provider-aci/issues/1218
+		depends_on = [
+			aci_rest_managed.bd_%[2]s
+		]
 		dn = "${aci_rest_managed.tenant_%[2]s.id}/BD-%[1]s_2"
 		class_name = "fvBD"
 		content = {