From dc95bd3468d497abf9a37428a45e0809fad09acc Mon Sep 17 00:00:00 2001
From: The Magician <magic-modules@google.com>
Date: Tue, 16 Apr 2019 13:06:09 -0700
Subject: [PATCH] Fixup non-Removed ISV tests (#3443)

<!-- This change is generated by MagicModules. -->
Original Author: @rileykarson
---
 google/resource_container_node_pool_test.go | 49 +++++++++++----------
 google/resource_google_project_test.go      | 14 +++---
 2 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/google/resource_container_node_pool_test.go b/google/resource_container_node_pool_test.go
index 92d4b8fc..18e83bbf 100644
--- a/google/resource_container_node_pool_test.go
+++ b/google/resource_container_node_pool_test.go
@@ -99,7 +99,7 @@ func TestAccContainerNodePool_withNodeConfig(t *testing.T) {
 				ImportStateVerify: true,
 				// autoscaling.# = 0 is equivalent to no autoscaling at all,
 				// but will still cause an import diff
-				ImportStateVerifyIgnore: []string{"autoscaling.#"},
+				ImportStateVerifyIgnore: []string{"autoscaling.#", "max_pods_per_node"},
 			},
 			{
 				Config: testAccContainerNodePool_withNodeConfigUpdate(cluster, nodePool),
@@ -406,6 +406,30 @@ func TestAccContainerNodePool_version(t *testing.T) {
 	})
 }
 
+func TestAccContainerNodePool_regionalClusters(t *testing.T) {
+	t.Parallel()
+
+	cluster := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
+	np := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckContainerNodePoolDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccContainerNodePool_regionalClusters(cluster, np),
+			},
+			{
+				ResourceName:            "google_container_node_pool.np",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"max_pods_per_node"},
+			},
+		},
+	})
+}
+
 func testAccCheckContainerNodePoolDestroy(s *terraform.State) error {
 	config := testAccProvider.Meta().(*Config)
 
@@ -440,29 +464,6 @@ func testAccCheckContainerNodePoolDestroy(s *terraform.State) error {
 	return nil
 }
 
-func TestAccContainerNodePool_regionalClusters(t *testing.T) {
-	t.Parallel()
-
-	cluster := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
-	np := fmt.Sprintf("tf-nodepool-test-%s", acctest.RandString(10))
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:     func() { testAccPreCheck(t) },
-		Providers:    testAccProviders,
-		CheckDestroy: testAccCheckContainerNodePoolDestroy,
-		Steps: []resource.TestStep{
-			{
-				Config: testAccContainerNodePool_regionalClusters(cluster, np),
-			},
-			{
-				ResourceName:      "google_container_node_pool.np",
-				ImportState:       true,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}
-
 func testAccContainerNodePool_basic(cluster, np string) string {
 	return fmt.Sprintf(`
 resource "google_container_cluster" "cluster" {
diff --git a/google/resource_google_project_test.go b/google/resource_google_project_test.go
index 84df51e9..acb6c195 100644
--- a/google/resource_google_project_test.go
+++ b/google/resource_google_project_test.go
@@ -89,9 +89,10 @@ func TestAccProject_billing(t *testing.T) {
 			},
 			// Make sure import supports billing account
 			{
-				ResourceName:      "google_project.acceptance",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_project.acceptance",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"skip_delete"},
 			},
 			// Update to a different  billing account
 			{
@@ -129,9 +130,10 @@ func TestAccProject_labels(t *testing.T) {
 			},
 			// Make sure import supports labels
 			{
-				ResourceName:      "google_project.acceptance",
-				ImportState:       true,
-				ImportStateVerify: true,
+				ResourceName:            "google_project.acceptance",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"skip_delete"},
 			},
 			// update project with labels
 			{