Fix failing project_services import test and merge it (#1297)

* Fix failing project_services import test and merge it

* Use the original list of services

google/import_google_project_services_test.go

@@ -1,35 +0,0 @@
-package google
-
-import (
-	"testing"
-
-	"github.com/hashicorp/terraform/helper/acctest"
-	"github.com/hashicorp/terraform/helper/resource"
-)
-
-func TestAccProjectServices_importBasic(t *testing.T) {
-	t.Parallel()
-
-	org := getTestOrgFromEnv(t)
-	resourceName := "google_project_services.acceptance"
-	projectId := "terraform-" + acctest.RandString(10)
-	services := []string{"iam.googleapis.com", "cloudresourcemanager.googleapis.com", "servicemanagement.googleapis.com"}
-
-	conf := testAccProjectAssociateServicesBasic(services, projectId, pname, org)
-
-	resource.Test(t, resource.TestCase{
-		PreCheck:  func() { testAccPreCheck(t) },
-		Providers: testAccProviders,
-		Steps: []resource.TestStep{
-			resource.TestStep{
-				Config: conf,
-			},
-			resource.TestStep{
-				ResourceName:      resourceName,
-				ImportState:       true,
-				ImportStateId:     projectId,
-				ImportStateVerify: true,
-			},
-		},
-	})
-}

google/resource_google_project_services_test.go

@@ -51,6 +51,13 @@ func TestAccProjectServices_basic(t *testing.T) {
 					testProjectServicesMatch(services2, pid),
 				),
 			},
+			resource.TestStep{
+				ResourceName:            "google_project_services.acceptance",
+				ImportState:             true,
+				ImportStateId:           pid,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"disable_on_destroy"},
+			},
 		},
 	})
 }
@@ -228,8 +235,9 @@ resource "google_project" "acceptance" {
   org_id     = "%s"
 }
 resource "google_project_services" "acceptance" {
-  project  = "${google_project.acceptance.project_id}"
-  services = [%s]
+  project            = "${google_project.acceptance.project_id}"
+  services           = [%s]
+  disable_on_destroy = true
 }
 `, pid, name, org, testStringsToString(services))
 }