Merge pull request hashicorp#4573 from hashicorp/b-more-azure-acceptance-tests

provider/azure: More fixes to acceptance tests

Author: jen20

builtin/providers/azure/resource_azure_instance_test.go

@@ -224,7 +224,7 @@ func testAccCheckAzureInstanceAdvancedAttributes(
 			return fmt.Errorf("Bad name: %s", dpmt.Name)
 		}
 
-		if dpmt.VirtualNetworkName != "terraform-vnet" {
+		if dpmt.VirtualNetworkName != "terraform-vnet-advanced-test" {
 			return fmt.Errorf("Bad virtual network: %s", dpmt.VirtualNetworkName)
 		}
 

builtin/providers/azure/resource_azure_storage_service_test.go

@@ -20,7 +20,7 @@ func TestAccAzureStorageService(t *testing.T) {
 				Config: testAccAzureStorageServiceConfig,
 				Check: resource.ComposeTestCheckFunc(
 					testAccAzureStorageServiceExists(name),
-					resource.TestCheckResourceAttr(name, "name", "tftesting_dis"),
+					resource.TestCheckResourceAttr(name, "name", "tftestingdis"),
 					resource.TestCheckResourceAttr(name, "location", "West US"),
 					resource.TestCheckResourceAttr(name, "description", "very descriptive"),
 					resource.TestCheckResourceAttr(name, "account_type", "Standard_LRS"),
@@ -70,7 +70,7 @@ func testAccAzureStorageServiceDestroyed(s *terraform.State) error {
 var testAccAzureStorageServiceConfig = `
 resource "azure_storage_service" "foo" {
   # NOTE: storage service names constrained to lowercase letters only.
-  name = "tftesting_dis"
+  name = "tftestingdis"
   location = "West US"
   description = "very descriptive"
   account_type = "Standard_LRS"