Skip to content

Commit

Permalink
Merge pull request #5270 from terraform-providers/kt/fix_more_test_fa…
Browse files Browse the repository at this point in the history 
…ilures

provider: fix more failing tests
  • Loading branch information
@tombuildsstuff
tombuildsstuff authored Jan 2, 2020
2 parents 0f5dc58 + b22d85c commit ade9703
Show file tree
Hide file tree
Showing 67 changed files with 416 additions and 450 deletions.
55 changes: 23 additions & 32 deletions ...rvices/applicationinsights/tests/resource_arm_application_insights_analytics_item_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,48 +73,39 @@ func TestAccAzureRMApplicationInsightsAnalyticsItem_update(t *testing.T) {
}

func TestAccAzureRMApplicationInsightsAnalyticsItem_multiple(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test")
resourceName2 := "azurerm_application_insights_analytics_item.test2"
resourceName3 := "azurerm_application_insights_analytics_item.test3"
config := testAccAzureRMApplicationInsightsAnalyticsItem_multiple(data)
r1 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test1")
r2 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test2")
r3 := acceptance.BuildTestData(t, "azurerm_application_insights_analytics_item", "test3")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMApplicationInsightAnalyticsItemDestroy(),
Steps: []resource.TestStep{
{
Config: config,
Config: testAccAzureRMApplicationInsightsAnalyticsItem_multiple(r1),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMApplicationInsightsAnalyticsItemExists(data.ResourceName),
testCheckAzureRMApplicationInsightsAnalyticsItemExists(resourceName2),
testCheckAzureRMApplicationInsightsAnalyticsItemExists(resourceName3),
resource.TestCheckResourceAttr(data.ResourceName, "name", "testquery1"),
resource.TestCheckResourceAttr(data.ResourceName, "scope", "shared"),
resource.TestCheckResourceAttr(data.ResourceName, "type", "query"),
resource.TestCheckResourceAttr(data.ResourceName, "content", "requests #test1"),
resource.TestCheckResourceAttr(resourceName2, "name", "testquery2"),
resource.TestCheckResourceAttr(resourceName2, "scope", "user"),
resource.TestCheckResourceAttr(resourceName2, "type", "query"),
resource.TestCheckResourceAttr(resourceName2, "content", "requests #test2"),
resource.TestCheckResourceAttr(resourceName3, "name", "testfunction1"),
resource.TestCheckResourceAttr(resourceName3, "scope", "shared"),
resource.TestCheckResourceAttr(resourceName3, "type", "function"),
resource.TestCheckResourceAttr(resourceName3, "content", "requests #test3"),
resource.TestCheckResourceAttr(resourceName3, "function_alias", "myfunction"),
testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName),
testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName),
testCheckAzureRMApplicationInsightsAnalyticsItemExists(r1.ResourceName),
resource.TestCheckResourceAttr(r1.ResourceName, "name", "testquery1"),
resource.TestCheckResourceAttr(r1.ResourceName, "scope", "shared"),
resource.TestCheckResourceAttr(r1.ResourceName, "type", "query"),
resource.TestCheckResourceAttr(r1.ResourceName, "content", "requests #test1"),
resource.TestCheckResourceAttr(r2.ResourceName, "name", "testquery2"),
resource.TestCheckResourceAttr(r2.ResourceName, "scope", "user"),
resource.TestCheckResourceAttr(r2.ResourceName, "type", "query"),
resource.TestCheckResourceAttr(r2.ResourceName, "content", "requests #test2"),
resource.TestCheckResourceAttr(r3.ResourceName, "name", "testfunction1"),
resource.TestCheckResourceAttr(r3.ResourceName, "scope", "shared"),
resource.TestCheckResourceAttr(r3.ResourceName, "type", "function"),
resource.TestCheckResourceAttr(r3.ResourceName, "content", "requests #test3"),
resource.TestCheckResourceAttr(r3.ResourceName, "function_alias", "myfunction"),
),
},
data.ImportStep(),
{
ResourceName: resourceName2,
ImportState: true,
ImportStateVerify: true,
},
{
ResourceName: resourceName3,
ImportState: true,
ImportStateVerify: true,
},
r1.ImportStep(),
r2.ImportStep(),
r3.ImportStep(),
},
})
}
Expand Down
22 changes: 8 additions & 14 deletions azurerm/internal/services/batch/tests/resource_arm_batch_account_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,15 @@ func TestValidateBatchAccountName(t *testing.T) {
}

func TestAccAzureRMBatchAccount_basic(t *testing.T) {
data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test")

config := testAccAzureRMBatchAccount_basic(data)
data := acceptance.BuildTestData(t, "azurerm_batch_account", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMBatchAccountDestroy,
Steps: []resource.TestStep{
{
Config: config,
Config: testAccAzureRMBatchAccount_basic(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMBatchAccountExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"),
Expand All @@ -68,7 +66,7 @@ func TestAccAzureRMBatchAccount_requiresImport(t *testing.T) {
t.Skip("Skipping since resources aren't required to be imported")
return
}
data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test")
data := acceptance.BuildTestData(t, "azurerm_batch_account", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Expand All @@ -90,18 +88,15 @@ func TestAccAzureRMBatchAccount_requiresImport(t *testing.T) {
}

func TestAccAzureRMBatchAccount_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test")

config := testAccAzureRMBatchAccount_complete(data)
configUpdate := testAccAzureRMBatchAccount_completeUpdated(data)
data := acceptance.BuildTestData(t, "azurerm_batch_account", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMBatchAccountDestroy,
Steps: []resource.TestStep{
{
Config: config,
Config: testAccAzureRMBatchAccount_complete(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMBatchAccountExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"),
Expand All @@ -110,7 +105,7 @@ func TestAccAzureRMBatchAccount_complete(t *testing.T) {
),
},
{
Config: configUpdate,
Config: testAccAzureRMBatchAccount_completeUpdated(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMBatchAccountExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "BatchService"),
Expand All @@ -124,17 +119,16 @@ func TestAccAzureRMBatchAccount_complete(t *testing.T) {
}

func TestAccAzureRMBatchAccount_userSubscription(t *testing.T) {
data := acceptance.BuildTestData(t, "data.azurerm_batch_account", "test")
data := acceptance.BuildTestData(t, "azurerm_batch_account", "test")
tenantID := os.Getenv("ARM_TENANT_ID")
config := testAccAzureRMBatchAccount_userSubscription(data, tenantID)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMBatchAccountDestroy,
Steps: []resource.TestStep{
{
Config: config,
Config: testAccAzureRMBatchAccount_userSubscription(data, tenantID),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMBatchAccountExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "pool_allocation_mode", "UserSubscription"),
Expand Down
5 changes: 1 addition & 4 deletions azurerm/internal/services/compute/tests/data_source_image_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func TestAccDataSourceAzureRMImage_basic(t *testing.T) {
}

func TestAccDataSourceAzureRMImage_localFilter(t *testing.T) {
data := acceptance.BuildTestData(t, "data.azurerm_image", "test")
data := acceptance.BuildTestData(t, "data.azurerm_image", "test1")
descDataSourceName := "data.azurerm_image.test2"

resource.ParallelTest(t, resource.TestCase{
Expand Down Expand Up @@ -337,8 +337,5 @@ data "azurerm_image" "test2" {
resource_group_name = "${azurerm_resource_group.test.name}"
}
output "location" {
value = "${data.azurerm_image.test1.location}"
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger)
}
2 changes: 1 addition & 1 deletion ...ternal/services/compute/tests/resource_arm_linux_virtual_machine_scale_set_images_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ resource "azurerm_linux_virtual_machine_scale_set" "test" {
publisher = "cloudbees"
}
depends_on = ["azurerm_marketplace_agreement", "test"]
depends_on = ["azurerm_marketplace_agreement.test"]
}
`, template, data.RandomInteger)
}
5 changes: 2 additions & 3 deletions azurerm/internal/services/compute/tests/resource_arm_snapshot_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,15 +191,14 @@ func TestAccAzureRMSnapshot_fromExistingSnapshot(t *testing.T) {

func TestAccAzureRMSnapshot_fromUnmanagedDisk(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_snapshot", "test")
config := testAccAzureRMSnapshot_fromUnmanagedDisk(data)

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMSnapshotDestroy,
Steps: []resource.TestStep{
{
Config: config,
Config: testAccAzureRMSnapshot_fromUnmanagedDisk(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMSnapshotExists(data.ResourceName),
),
Expand Down Expand Up @@ -584,7 +583,7 @@ resource "azurerm_snapshot" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
create_option = "Import"
source_uri = "${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}/myosdisk1.vhd"
depends_on = ["azurerm_virtual_machine", "test")]
depends_on = ["azurerm_virtual_machine", "test"]
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger, data.RandomInteger, data.RandomString, data.RandomInteger, data.RandomInteger, data.RandomInteger)
}
2 changes: 1 addition & 1 deletion ...internal/services/compute/tests/resource_arm_virtual_machine_data_disk_attachment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ resource "azurerm_managed_disk" "test" {
func testAccAzureRMVirtualMachineDataDiskAttachment_virtualMachineExtensionPrep(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG%d"
name = "acctestRG-%d"
location = "%s"
}
Expand Down
4 changes: 2 additions & 2 deletions azurerm/internal/services/compute/tests/resource_arm_virtual_machine_managed_disks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2420,7 +2420,7 @@ resource "azurerm_virtual_machine" "test" {
func testAccAzureRMVirtualMachine_anWithVM(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctest-rg-%d"
name = "acctestRG-%d"
location = "%s"
}
Expand Down Expand Up @@ -2494,7 +2494,7 @@ resource "azurerm_virtual_machine" "test" {
func testAccAzureRMVirtualMachine_hasDiskInfoWhenStopped(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctest-rg-%d"
name = "acctestRG-%d"
location = "%s"
}
Expand Down
8 changes: 4 additions & 4 deletions azurerm/internal/services/compute/tests/resource_arm_virtual_machine_unmanaged_disks_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2615,7 +2615,7 @@ resource "azurerm_virtual_machine" "test" {
func testAccAzureRMVirtualMachine_linuxMachineWithSSH(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG%s"
name = "acctestRG-%d"
location = "%s"
}
Expand Down Expand Up @@ -2697,13 +2697,13 @@ resource "azurerm_virtual_machine" "test" {
}
}
}
`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString)
}

func testAccAzureRMVirtualMachine_linuxMachineWithSSHRemoved(data acceptance.TestData) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG%s"
name = "acctestRG-%d"
location = "%s"
}
Expand Down Expand Up @@ -2780,7 +2780,7 @@ resource "azurerm_virtual_machine" "test" {
disable_password_authentication = true
}
}
`, data.RandomString, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString)
}

func testAccAzureRMVirtualMachine_primaryNetworkInterfaceId(data acceptance.TestData) string {
Expand Down
2 changes: 1 addition & 1 deletion ...rnal/services/compute/tests/resource_arm_windows_virtual_machine_scale_set_images_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ resource "azurerm_windows_virtual_machine_scale_set" "test" {
publisher = "plesk"
}
depends_on = ["azurerm_marketplace_agreement", "test")]
depends_on = ["azurerm_marketplace_agreement.test"]
}
`, template)
}
4 changes: 3 additions & 1 deletion azurerm/internal/services/devtestlabs/resource_arm_dev_test_lab_schedule.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ func resourceArmDevTestLabSchedules() *schema.Resource {

"location": azure.SchemaLocation(),

"resource_group_name": azure.SchemaResourceGroupName(),
// There's a bug in the Azure API where this is returned in lower-case
// BUG: https://github.com/Azure/azure-rest-api-specs/issues/3964
"resource_group_name": azure.SchemaResourceGroupNameDiffSuppress(),

"lab_name": {
Type: schema.TypeString,
Expand Down
16 changes: 6 additions & 10 deletions azurerm/internal/services/dns/tests/resource_arm_dns_cname_record_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,23 +170,21 @@ func TestAccAzureRMDnsCNameRecord_withAlias(t *testing.T) {

func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_dns_cname_record", "test")
targetResourceName := "azurerm_public_ip.test"
preConfig := testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data)
postConfig := testAccAzureRMDnsCNameRecord_AliasToRecord(data)
targetResourceName := "azurerm_dns_cname_record.target2"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMDnsCNameRecordDestroy,
Steps: []resource.TestStep{
{
Config: preConfig,
Config: testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMDnsCNameRecordExists(data.ResourceName),
),
},
{
Config: postConfig,
Config: testAccAzureRMDnsCNameRecord_AliasToRecord(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMDnsCNameRecordExists(data.ResourceName),
resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"),
Expand All @@ -200,24 +198,22 @@ func TestAccAzureRMDnsCNameRecord_RecordToAlias(t *testing.T) {

func TestAccAzureRMDnsCNameRecord_AliasToRecord(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_dns_cname_record", "test")
targetResourceName := "azurerm_public_ip.test"
preConfig := testAccAzureRMDnsCNameRecord_AliasToRecord(data)
postConfig := testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data)
targetResourceName := "azurerm_dns_cname_record.target2"

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMDnsCNameRecordDestroy,
Steps: []resource.TestStep{
{
Config: preConfig,
Config: testAccAzureRMDnsCNameRecord_AliasToRecord(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMDnsCNameRecordExists(data.ResourceName),
resource.TestCheckResourceAttrPair(data.ResourceName, "target_resource_id", targetResourceName, "id"),
),
},
{
Config: postConfig,
Config: testAccAzureRMDnsCNameRecord_AliasToRecordUpdate(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMDnsCNameRecordExists(data.ResourceName),
resource.TestCheckNoResourceAttr(data.ResourceName, "target_resource_id"),
Expand Down
8 changes: 4 additions & 4 deletions azurerm/internal/services/keyvault/tests/resource_arm_key_vault_access_policy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ func testAccAzureRMKeyVaultAccessPolicy_template(data acceptance.TestData) strin
data "azurerm_client_config" "current" {}
resource "azurerm_resource_group" "test" {
name = "acctestRG-%s"
name = "acctestRG-%d"
location = "%s"
}
Expand All @@ -402,15 +402,15 @@ resource "azurerm_key_vault" "test" {
environment = "Production"
}
}
`, data.RandomString, data.Locations.Primary, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}

func testAccAzureRMKeyVaultAccessPolicy_nonExistentVault(data acceptance.TestData) string {
return fmt.Sprintf(`
data "azurerm_client_config" "current" {}
resource "azurerm_resource_group" "test" {
name = "acctestRG-%s"
name = "acctestRG-%d"
location = "%s"
}
Expand Down Expand Up @@ -442,5 +442,5 @@ resource "azurerm_key_vault_access_policy" "test" {
"get",
]
}
`, data.RandomString, data.Locations.Primary, data.RandomString)
`, data.RandomInteger, data.Locations.Primary, data.RandomString)
}
Loading

0 comments on commit ade9703

Please sign in to comment.