TestAccAzureRMImage: update ubuntu version from 16.04 to 18.0

hashicorp · Apr 18, 2019 · 9a8f4ec · 9a8f4ec
1 parent 66ea83a
commit 9a8f4ec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/azurerm/data_source_image.go b/azurerm/data_source_image.go
@@ -142,7 +142,7 @@ func dataSourceArmImageRead(d *schema.ResourceData, meta interface{}) error {
 		resp, err := client.ListByResourceGroupComplete(ctx, resGroup)
 		if err != nil {
 			if utils.ResponseWasNotFound(resp.Response().Response) {
-				return fmt.Errorf("Error: Image %q (Resource Group %q) was not found", name, resGroup)
+				return fmt.Errorf("Error: Unable to find Resource Group %q", resGroup)
 			}
 			return fmt.Errorf("[ERROR] Error getting list of images (resource group %q): %+v", resGroup, err)
 		}

diff --git a/azurerm/data_source_image_test.go b/azurerm/data_source_image_test.go
@@ -334,13 +334,13 @@ resource "azurerm_image" "def" {
 
 data "azurerm_image" "test1" {
   name_regex          = "^def-acctest-\\d+"
-  resource_group_name = "${azurerm_resource_group.test.name}${substr(azurerm_image.abc.name, 0, 0)}${substr(azurerm_image.def.name, 0, 0)}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
 data "azurerm_image" "test2" {
   name_regex          = "^[a-z]+-acctest-\\d+"
   sort_descending     = true
-  resource_group_name = "${azurerm_resource_group.test.name}${substr(azurerm_image.abc.name, 0, 0)}${substr(azurerm_image.def.name, 0, 0)}"
+  resource_group_name = "${azurerm_resource_group.test.name}"
 }
 
 output "location" {

diff --git a/azurerm/resource_arm_network_ddos_protection_plan_test.go b/azurerm/resource_arm_network_ddos_protection_plan_test.go
@@ -53,7 +53,7 @@ func testAccAzureRMNetworkDDoSProtectionPlan_basic(t *testing.T) {
 				Config: testAccAzureRMNetworkDDoSProtectionPlan_basicConfig(ri, location),
 				Check: resource.ComposeTestCheckFunc(
 					testCheckAzureRMNetworkDDoSProtectionPlanExists(resourceName),
-					resource.TestCheckResourceAttrSet(resourceName, "virtual_network_ids.#"),
+					resource.TestCheckResourceAttr(resourceName, "virtual_network_ids.#", "7"),
 				),
 			},
 			{