Fixing some broken tests

hashicorp · May 14, 2018 · 8ddf34f · 8ddf34f
1 parent 3e463c7
commit 8ddf34f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/azurerm/import_arm_virtual_machine_data_disk_attachment_test.go b/azurerm/import_arm_virtual_machine_data_disk_attachment_test.go
@@ -77,7 +77,6 @@ func TestAccAzureRMVirtualMachineDataDiskAttachment_importExistingManagedDisk(t
 }
 
 func TestAccAzureRMVirtualMachineDataDiskAttachment_importMultipleDisks(t *testing.T) {
-	resourceName := "azurerm_virtual_machine_data_disk_attachment.test"
 	ri := acctest.RandInt()
 	location := testLocation()
 	config := testAccAzureRMVirtualMachineDataDiskAttachment_multipleDisks(ri, location, 1, 2)
@@ -91,7 +90,12 @@ func TestAccAzureRMVirtualMachineDataDiskAttachment_importMultipleDisks(t *testi
 				Config: config,
 			},
 			{
-				ResourceName:      resourceName,
+				ResourceName:      "azurerm_virtual_machine_data_disk_attachment.first",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+			{
+				ResourceName:      "azurerm_virtual_machine_data_disk_attachment.second",
 				ImportState:       true,
 				ImportStateVerify: true,
 			},

diff --git a/azurerm/resource_arm_virtual_machine_data_disk_attachment_test.go b/azurerm/resource_arm_virtual_machine_data_disk_attachment_test.go
@@ -461,14 +461,14 @@ resource "azurerm_managed_disk" "test" {
 }
 
 resource "azurerm_virtual_machine_data_disk_attachment" "test" {
-  name               = "disk1-%d"
+  name               = "${azurerm_managed_disk.test.name}"
   virtual_machine_id = "${azurerm_virtual_machine.test.id}"
   managed_disk_id    = "${azurerm_managed_disk.test.id}"
   create_option      = "Attach"
   managed_disk_type  = "Standard_LRS"
   lun                = 1
 }
-`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt, rInt)
+`, rInt, location, rInt, rInt, rInt, rInt, rInt, rInt, rInt)
 }
 
 func testAccAzureRMVirtualMachineDataDiskAttachment_multipleDisks(rInt int, location string, firstDiskLun int, secondDiskLun int) string {