From 96a67766bf94fdba15f607a9f620cc7df3675a9b Mon Sep 17 00:00:00 2001
From: Thomas Poindessous <thomas@skale-5.com>
Date: Mon, 22 May 2017 23:36:53 +0200
Subject: [PATCH] Corrected test for generating disk from a snapshot URI from
 another project

---
 .../google/resource_compute_disk_test.go      | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/builtin/providers/google/resource_compute_disk_test.go b/builtin/providers/google/resource_compute_disk_test.go
index 7b1f4042e..c86d42203 100644
--- a/builtin/providers/google/resource_compute_disk_test.go
+++ b/builtin/providers/google/resource_compute_disk_test.go
@@ -33,6 +33,10 @@ func TestAccComputeDisk_basic(t *testing.T) {
 
 func TestAccComputeDisk_from_snapshot_uri(t *testing.T) {
 	diskName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	firstDiskName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	snapshotName := fmt.Sprintf("tf-test-%s", acctest.RandString(10))
+	var xpn_host = os.Getenv("GOOGLE_XPN_HOST_PROJECT")
+
 	var disk compute.Disk
 
 	resource.Test(t, resource.TestCase{
@@ -41,10 +45,10 @@ func TestAccComputeDisk_from_snapshot_uri(t *testing.T) {
 		CheckDestroy: testAccCheckComputeDiskDestroy,
 		Steps: []resource.TestStep{
 			resource.TestStep{
-				Config: testAccComputeDisk_from_snapshot_uri(diskName),
+				Config: testAccComputeDisk_from_snapshot_uri(firstDiskName, snapshotName, diskName, xpn_host),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckComputeDiskExists(
-						"google_compute_disk.foobar", &disk),
+						"google_compute_disk.seconddisk", &disk),
 				),
 			},
 		},
@@ -151,15 +155,29 @@ resource "google_compute_disk" "foobar" {
 }`, diskName)
 }
 
-func testAccComputeDisk_from_snapshot_uri(diskName string) string {
-	uri := os.Getenv("GOOGLE_COMPUTE_DISK_SNAPSHOT_URI")
+func testAccComputeDisk_from_snapshot_uri(firstDiskName string, snapshotName string, diskName string, xpn_host string) string {
 	return fmt.Sprintf(`
-resource "google_compute_disk" "foobar" {
+		resource "google_compute_disk" "foobar" {
+			name = "%s"
+			image = "debian-8-jessie-v20160803"
+			size = 50
+			type = "pd-ssd"
+			zone = "us-central1-a"
+			project = "%s"
+		}
+
+resource "google_compute_snapshot" "snapdisk" {
+  name = "%s"
+  source_disk = "${google_compute_disk.foobar.name}"
+  zone = "us-central1-a"
+	project = "%s"
+}
+resource "google_compute_disk" "seconddisk" {
 	name = "%s"
-	snapshot = "%s"
+	snapshot = "${google_compute_snapshot.snapdisk.self_link}"
 	type = "pd-ssd"
 	zone = "us-central1-a"
-}`, diskName, uri)
+}`, firstDiskName, xpn_host, snapshotName, xpn_host, diskName)
 }
 
 func testAccComputeDisk_encryption(diskName string) string {