Skip to content

Commit e0b94e4

Browse files
authored
provider/azurerm: Removing the commented out acceptance tests as they were killing the test runner (hashicorp#10368)
1 parent 08b8602 commit e0b94e4

2 files changed

Lines changed: 0 additions & 189 deletions

File tree

builtin/providers/azurerm/resource_arm_network_interface_card_test.go

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -98,35 +98,6 @@ func TestAccAzureRMNetworkInterface_withTags(t *testing.T) {
9898
})
9999
}
100100

101-
///TODO: Re-enable this test when https://github.com/Azure/azure-sdk-for-go/issues/259 is fixed
102-
//func TestAccAzureRMNetworkInterface_addingIpConfigurations(t *testing.T) {
103-
//
104-
// resource.Test(t, resource.TestCase{
105-
// PreCheck: func() { testAccPreCheck(t) },
106-
// Providers: testAccProviders,
107-
// CheckDestroy: testCheckAzureRMNetworkInterfaceDestroy,
108-
// Steps: []resource.TestStep{
109-
// resource.TestStep{
110-
// Config: testAccAzureRMNetworkInterface_basic,
111-
// Check: resource.ComposeTestCheckFunc(
112-
// testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"),
113-
// resource.TestCheckResourceAttr(
114-
// "azurerm_network_interface.test", "ip_configuration.#", "1"),
115-
// ),
116-
// },
117-
//
118-
// resource.TestStep{
119-
// Config: testAccAzureRMNetworkInterface_extraIpConfiguration,
120-
// Check: resource.ComposeTestCheckFunc(
121-
// testCheckAzureRMNetworkInterfaceExists("azurerm_network_interface.test"),
122-
// resource.TestCheckResourceAttr(
123-
// "azurerm_network_interface.test", "ip_configuration.#", "2"),
124-
// ),
125-
// },
126-
// },
127-
// })
128-
//}
129-
130101
func testCheckAzureRMNetworkInterfaceExists(name string) resource.TestCheckFunc {
131102
return func(s *terraform.State) error {
132103
// Ensure we have enough information in state to look up in API
@@ -355,51 +326,3 @@ resource "azurerm_network_interface" "test" {
355326
}
356327
`, rInt)
357328
}
358-
359-
//TODO: Re-enable this test when https://github.com/Azure/azure-sdk-for-go/issues/259 is fixed
360-
//var testAccAzureRMNetworkInterface_extraIpConfiguration = `
361-
//resource "azurerm_resource_group" "test" {
362-
// name = "acceptanceTestResourceGroup1"
363-
// location = "West US"
364-
//}
365-
//
366-
//resource "azurerm_virtual_network" "test" {
367-
// name = "acceptanceTestVirtualNetwork1"
368-
// address_space = ["10.0.0.0/16"]
369-
// location = "West US"
370-
// resource_group_name = "${azurerm_resource_group.test.name}"
371-
//}
372-
//
373-
//resource "azurerm_subnet" "test" {
374-
// name = "testsubnet"
375-
// resource_group_name = "${azurerm_resource_group.test.name}"
376-
// virtual_network_name = "${azurerm_virtual_network.test.name}"
377-
// address_prefix = "10.0.2.0/24"
378-
//}
379-
//
380-
//resource "azurerm_subnet" "test1" {
381-
// name = "testsubnet1"
382-
// resource_group_name = "${azurerm_resource_group.test.name}"
383-
// virtual_network_name = "${azurerm_virtual_network.test.name}"
384-
// address_prefix = "10.0.1.0/24"
385-
//}
386-
//
387-
//resource "azurerm_network_interface" "test" {
388-
// name = "acceptanceTestNetworkInterface1"
389-
// location = "West US"
390-
// resource_group_name = "${azurerm_resource_group.test.name}"
391-
//
392-
// ip_configuration {
393-
// name = "testconfiguration1"
394-
// subnet_id = "${azurerm_subnet.test.id}"
395-
// private_ip_address_allocation = "dynamic"
396-
// }
397-
//
398-
// ip_configuration {
399-
// name = "testconfiguration2"
400-
// subnet_id = "${azurerm_subnet.test1.id}"
401-
// private_ip_address_allocation = "dynamic"
402-
// primary = true
403-
// }
404-
//}
405-
//`

builtin/providers/azurerm/resource_arm_virtual_machine_scale_set_test.go

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,6 @@ func TestAccAzureRMVirtualMachineScaleSet_basicLinux_disappears(t *testing.T) {
4848
})
4949
}
5050

51-
//func TestAccAzureRMVirtualMachineScaleSet_basicWindowsMachine(t *testing.T) {
52-
// ri := acctest.RandInt()
53-
// rs := acctest.RandString(6)
54-
// config := fmt.Sprintf(testAccAzureRMVirtualMachineScaleSet_basicWindows, ri, ri, ri, ri, ri, ri, rs, ri)
55-
// resource.Test(t, resource.TestCase{
56-
// PreCheck: func() { testAccPreCheck(t) },
57-
// Providers: testAccProviders,
58-
// CheckDestroy: testCheckAzureRMVirtualMachineScaleSetDestroy,
59-
// Steps: []resource.TestStep{
60-
// {
61-
// Config: config,
62-
// Check: resource.ComposeTestCheckFunc(
63-
// testCheckAzureRMVirtualMachineScaleSetExists("azurerm_virtual_machine_scale_set.test"),
64-
// ),
65-
// },
66-
// },
67-
// })
68-
//}
69-
7051
func testCheckAzureRMVirtualMachineScaleSetExists(name string) resource.TestCheckFunc {
7152
return func(s *terraform.State) error {
7253
// Ensure we have enough information in state to look up in API
@@ -238,96 +219,3 @@ resource "azurerm_virtual_machine_scale_set" "test" {
238219
}
239220
}
240221
`
241-
242-
var testAccAzureRMVirtualMachineScaleSet_basicWindows = `
243-
resource "azurerm_resource_group" "test" {
244-
name = "acctestRG-%d"
245-
location = "West US"
246-
}
247-
248-
resource "azurerm_virtual_network" "test" {
249-
name = "acctvn-%d"
250-
address_space = ["10.0.0.0/16"]
251-
location = "West US"
252-
resource_group_name = "${azurerm_resource_group.test.name}"
253-
}
254-
255-
resource "azurerm_subnet" "test" {
256-
name = "acctsub-%d"
257-
resource_group_name = "${azurerm_resource_group.test.name}"
258-
virtual_network_name = "${azurerm_virtual_network.test.name}"
259-
address_prefix = "10.0.2.0/24"
260-
}
261-
262-
resource "azurerm_network_interface" "test" {
263-
name = "acctni-%d"
264-
location = "West US"
265-
resource_group_name = "${azurerm_resource_group.test.name}"
266-
267-
ip_configuration {
268-
name = "testconfiguration1"
269-
subnet_id = "${azurerm_subnet.test.id}"
270-
private_ip_address_allocation = "dynamic"
271-
}
272-
}
273-
274-
resource "azurerm_storage_account" "test" {
275-
name = "accsa%d"
276-
resource_group_name = "${azurerm_resource_group.test.name}"
277-
location = "westus"
278-
account_type = "Standard_LRS"
279-
280-
tags {
281-
environment = "staging"
282-
}
283-
}
284-
285-
resource "azurerm_storage_container" "test" {
286-
name = "vhds"
287-
resource_group_name = "${azurerm_resource_group.test.name}"
288-
storage_account_name = "${azurerm_storage_account.test.name}"
289-
container_access_type = "private"
290-
}
291-
292-
resource "azurerm_virtual_machine_scale_set" "test" {
293-
name = "acctvmss-%d"
294-
location = "West US"
295-
resource_group_name = "${azurerm_resource_group.test.name}"
296-
upgrade_policy_mode = "Manual"
297-
298-
sku {
299-
name = "Standard_A0"
300-
tier = "Standard"
301-
capacity = 2
302-
}
303-
304-
os_profile {
305-
computer_name_prefix = "vm-%s"
306-
admin_username = "myadmin"
307-
admin_password = "Passwword1234"
308-
}
309-
310-
network_profile {
311-
name = "TestNetworkProfile-%d"
312-
primary = true
313-
ip_configuration {
314-
name = "TestIPConfiguration"
315-
subnet_id = "${azurerm_subnet.test.id}"
316-
}
317-
}
318-
319-
storage_profile_os_disk {
320-
name = "osDiskProfile"
321-
caching = "ReadWrite"
322-
create_option = "FromImage"
323-
vhd_containers = ["${azurerm_storage_account.test.primary_blob_endpoint}${azurerm_storage_container.test.name}"]
324-
}
325-
326-
storage_profile_image_reference {
327-
publisher = "MicrosoftWindowsServer"
328-
offer = "WindowsServer"
329-
sku = "2012-R2-Datacenter"
330-
version = "4.0.20160518"
331-
}
332-
}
333-
`

0 commit comments

Comments
 (0)