Merge pull request #932 from cloudflare/more-test-fixes

More test fixes
cloudflare · Feb 3, 2021 · 6ff2dad · 6ff2dad
2 parents 5f61d79 + 73cc8b9
commit 6ff2dad
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/cloudflare/resource_cloudflare_access_identity_provider_test.go b/cloudflare/resource_cloudflare_access_identity_provider_test.go
@@ -56,7 +56,6 @@ func TestAccCloudflareAccessIdentityProviderOneTimePin(t *testing.T) {
 		os.Setenv("CLOUDFLARE_API_TOKEN", "")
 	}
 
-	t.Parallel()
 	rnd := generateRandomResourceName()
 	resourceName := "cloudflare_access_identity_provider." + rnd
 	resource.Test(t, resource.TestCase{

diff --git a/cloudflare/resource_cloudflare_custom_hostname_test.go b/cloudflare/resource_cloudflare_custom_hostname_test.go
@@ -260,6 +260,7 @@ func TestAccCloudflareCustomHostname_UpdatingZoneForcesNewResource(t *testing.T)
 		PreCheck: func() {
 			testAccPreCheck(t)
 			testAccPreCheckAltZoneID(t)
+			testAccPreCheckAltDomain(t)
 		},
 		Providers: testAccProviders,
 		Steps: []resource.TestStep{
@@ -272,8 +273,7 @@ func TestAccCloudflareCustomHostname_UpdatingZoneForcesNewResource(t *testing.T)
 				),
 			},
 			{
-				ExpectNonEmptyPlan: true,
-				Config:             testAccCheckCloudflareCustomHostnameBasic(altZoneID, rnd, altDomain),
+				Config: testAccCheckCloudflareCustomHostnameBasic(altZoneID, rnd, altDomain),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckCloudflareCustomHostnameExists(resourceName, &after),
 					testAccCheckCloudflareCustomHostnameRecreated(&before, &after),

diff --git a/cloudflare/resource_cloudflare_waf_override_test.go b/cloudflare/resource_cloudflare_waf_override_test.go
@@ -21,7 +21,6 @@ func TestAccCloudflareWAFOverrideCreateAndUpdate(t *testing.T) {
 		os.Setenv("CLOUDFLARE_API_TOKEN", "")
 	}
 
-	t.Parallel()
 	zoneID := os.Getenv("CLOUDFLARE_ZONE_ID")
 	zoneName := os.Getenv("CLOUDFLARE_DOMAIN")
 

diff --git a/cloudflare/resource_cloudflare_worker_route_test.go b/cloudflare/resource_cloudflare_worker_route_test.go
@@ -15,8 +15,6 @@ const (
 )
 
 func TestAccCloudflareWorkerRoute_MultiScriptEnt(t *testing.T) {
-	t.Parallel()
-
 	// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the Workers
 	// service does not yet support the API tokens and it results in
 	// misleading state error messages.
@@ -97,8 +95,6 @@ resource "cloudflare_worker_script" "%[3]s" {
 }
 
 func TestAccCloudflareWorkerRoute_MultiScriptDisabledRoute(t *testing.T) {
-	t.Parallel()
-
 	// Temporarily unset CLOUDFLARE_API_TOKEN if it is set as the Workers
 	// service does not yet support the API tokens and it results in
 	// misleading state error messages.