Skip to content

Commit 16a725b

Browse files
stack72stack72
committed
provider/azurerm: Randomizing the ARM acceptance tests
1 parent bb9d9dc commit 16a725b

4 files changed

Lines changed: 57 additions & 31 deletions

‎builtin/providers/azurerm/import_arm_network_security_group_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,21 @@ package azurerm
33
import (
44
"testing"
55

6+
"github.com/hashicorp/terraform/helper/acctest"
67
"github.com/hashicorp/terraform/helper/resource"
78
)
89

910
func TestAccAzureRMNetworkSecurityGroup_importBasic(t *testing.T) {
1011
resourceName := "azurerm_network_security_group.test"
12+
rInt := acctest.RandInt()
1113

1214
resource.Test(t, resource.TestCase{
1315
PreCheck: func() { testAccPreCheck(t) },
1416
Providers: testAccProviders,
1517
CheckDestroy: testCheckAzureRMNetworkSecurityGroupDestroy,
1618
Steps: []resource.TestStep{
1719
resource.TestStep{
18-
Config: testAccAzureRMNetworkSecurityGroup_basic,
20+
Config: testAccAzureRMNetworkSecurityGroup_basic(rInt),
1921
},
2022

2123
resource.TestStep{

‎builtin/providers/azurerm/import_arm_network_security_rule_test.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ package azurerm
33
import (
44
"testing"
55

6+
"github.com/hashicorp/terraform/helper/acctest"
67
"github.com/hashicorp/terraform/helper/resource"
78
)
89

910
func TestAccAzureRMNetworkSecurityRule_importBasic(t *testing.T) {
11+
rInt := acctest.RandInt()
1012
resourceName := "azurerm_network_security_rule.test"
1113

1214
resource.Test(t, resource.TestCase{
@@ -15,7 +17,7 @@ func TestAccAzureRMNetworkSecurityRule_importBasic(t *testing.T) {
1517
CheckDestroy: testCheckAzureRMNetworkSecurityRuleDestroy,
1618
Steps: []resource.TestStep{
1719
resource.TestStep{
18-
Config: testAccAzureRMNetworkSecurityRule_basic,
20+
Config: testAccAzureRMNetworkSecurityRule_basic(rInt),
1921
},
2022

2123
resource.TestStep{

‎builtin/providers/azurerm/resource_arm_network_security_group_test.go‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,20 @@ import (
55
"net/http"
66
"testing"
77

8+
"github.com/hashicorp/terraform/helper/acctest"
89
"github.com/hashicorp/terraform/helper/resource"
910
"github.com/hashicorp/terraform/terraform"
1011
)
1112

1213
func TestAccAzureRMNetworkSecurityGroup_basic(t *testing.T) {
14+
rInt := acctest.RandInt()
1315
resource.Test(t, resource.TestCase{
1416
PreCheck: func() { testAccPreCheck(t) },
1517
Providers: testAccProviders,
1618
CheckDestroy: testCheckAzureRMNetworkSecurityGroupDestroy,
1719
Steps: []resource.TestStep{
1820
{
19-
Config: testAccAzureRMNetworkSecurityGroup_basic,
21+
Config: testAccAzureRMNetworkSecurityGroup_basic(rInt()),
2022
Check: resource.ComposeTestCheckFunc(
2123
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
2224
),
@@ -26,13 +28,14 @@ func TestAccAzureRMNetworkSecurityGroup_basic(t *testing.T) {
2628
}
2729

2830
func TestAccAzureRMNetworkSecurityGroup_disappears(t *testing.T) {
31+
rInt := acctest.RandInt()
2932
resource.Test(t, resource.TestCase{
3033
PreCheck: func() { testAccPreCheck(t) },
3134
Providers: testAccProviders,
3235
CheckDestroy: testCheckAzureRMNetworkSecurityGroupDestroy,
3336
Steps: []resource.TestStep{
3437
{
35-
Config: testAccAzureRMNetworkSecurityGroup_basic,
38+
Config: testAccAzureRMNetworkSecurityGroup_basic(rInt),
3639
Check: resource.ComposeTestCheckFunc(
3740
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
3841
testCheckAzureRMNetworkSecurityGroupDisappears("azurerm_network_security_group.test"),
@@ -44,13 +47,14 @@ func TestAccAzureRMNetworkSecurityGroup_disappears(t *testing.T) {
4447
}
4548

4649
func TestAccAzureRMNetworkSecurityGroup_withTags(t *testing.T) {
50+
rInt := acctest.RandInt()
4751
resource.Test(t, resource.TestCase{
4852
PreCheck: func() { testAccPreCheck(t) },
4953
Providers: testAccProviders,
5054
CheckDestroy: testCheckAzureRMNetworkSecurityGroupDestroy,
5155
Steps: []resource.TestStep{
5256
{
53-
Config: testAccAzureRMNetworkSecurityGroup_withTags,
57+
Config: testAccAzureRMNetworkSecurityGroup_withTags(rInt),
5458
Check: resource.ComposeTestCheckFunc(
5559
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
5660
resource.TestCheckResourceAttr(
@@ -63,7 +67,7 @@ func TestAccAzureRMNetworkSecurityGroup_withTags(t *testing.T) {
6367
},
6468

6569
{
66-
Config: testAccAzureRMNetworkSecurityGroup_withTagsUpdate,
70+
Config: testAccAzureRMNetworkSecurityGroup_withTagsUpdate(rInt),
6771
Check: resource.ComposeTestCheckFunc(
6872
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
6973
resource.TestCheckResourceAttr(
@@ -77,13 +81,14 @@ func TestAccAzureRMNetworkSecurityGroup_withTags(t *testing.T) {
7781
}
7882

7983
func TestAccAzureRMNetworkSecurityGroup_addingExtraRules(t *testing.T) {
84+
rInt := acctest.RandInt()
8085
resource.Test(t, resource.TestCase{
8186
PreCheck: func() { testAccPreCheck(t) },
8287
Providers: testAccProviders,
8388
CheckDestroy: testCheckAzureRMNetworkSecurityGroupDestroy,
8489
Steps: []resource.TestStep{
8590
{
86-
Config: testAccAzureRMNetworkSecurityGroup_basic,
91+
Config: testAccAzureRMNetworkSecurityGroup_basic(rInt),
8792
Check: resource.ComposeTestCheckFunc(
8893
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
8994
resource.TestCheckResourceAttr(
@@ -92,7 +97,7 @@ func TestAccAzureRMNetworkSecurityGroup_addingExtraRules(t *testing.T) {
9297
},
9398

9499
{
95-
Config: testAccAzureRMNetworkSecurityGroup_anotherRule,
100+
Config: testAccAzureRMNetworkSecurityGroup_anotherRule(rInt),
96101
Check: resource.ComposeTestCheckFunc(
97102
testCheckAzureRMNetworkSecurityGroupExists("azurerm_network_security_group.test"),
98103
resource.TestCheckResourceAttr(
@@ -182,9 +187,10 @@ func testCheckAzureRMNetworkSecurityGroupDestroy(s *terraform.State) error {
182187
return nil
183188
}
184189

185-
var testAccAzureRMNetworkSecurityGroup_basic = `
190+
func testAccAzureRMNetworkSecurityGroup_basic(rInt int) string {
191+
return fmt.Sprintf(`
186192
resource "azurerm_resource_group" "test" {
187-
name = "acceptanceTestResourceGroup1"
193+
name = "acctestRG-%d"
188194
location = "West US"
189195
}
190196
@@ -205,11 +211,13 @@ resource "azurerm_network_security_group" "test" {
205211
destination_address_prefix = "*"
206212
}
207213
}
208-
`
214+
`, rInt)
215+
}
209216

210-
var testAccAzureRMNetworkSecurityGroup_anotherRule = `
217+
func testAccAzureRMNetworkSecurityGroup_anotherRule(rInt int) string {
218+
return fmt.Sprintf(`
211219
resource "azurerm_resource_group" "test" {
212-
name = "acceptanceTestResourceGroup1"
220+
name = "acctestRG-%d"
213221
location = "West US"
214222
}
215223
@@ -242,11 +250,13 @@ resource "azurerm_network_security_group" "test" {
242250
destination_address_prefix = "*"
243251
}
244252
}
245-
`
253+
`, rInt)
254+
}
246255

247-
var testAccAzureRMNetworkSecurityGroup_withTags = `
256+
func testAccAzureRMNetworkSecurityGroup_withTags(rInt int) string {
257+
return fmt.Sprintf(`
248258
resource "azurerm_resource_group" "test" {
249-
name = "acceptanceTestResourceGroup1"
259+
name = "acctestRG-%d"
250260
location = "West US"
251261
}
252262
@@ -273,11 +283,13 @@ resource "azurerm_network_security_group" "test" {
273283
cost_center = "MSFT"
274284
}
275285
}
276-
`
286+
`, rInt)
287+
}
277288

278-
var testAccAzureRMNetworkSecurityGroup_withTagsUpdate = `
289+
func testAccAzureRMNetworkSecurityGroup_withTagsUpdate(rInt int) string {
290+
return fmt.Sprintf(`
279291
resource "azurerm_resource_group" "test" {
280-
name = "acceptanceTestResourceGroup1"
292+
name = "acctestRG-%d"
281293
location = "West US"
282294
}
283295
@@ -302,4 +314,5 @@ resource "azurerm_network_security_group" "test" {
302314
environment = "staging"
303315
}
304316
}
305-
`
317+
`, rInt)
318+
}

‎builtin/providers/azurerm/resource_arm_network_security_rule_test.go‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,20 @@ import (
55
"net/http"
66
"testing"
77

8+
"github.com/hashicorp/terraform/helper/acctest"
89
"github.com/hashicorp/terraform/helper/resource"
910
"github.com/hashicorp/terraform/terraform"
1011
)
1112

1213
func TestAccAzureRMNetworkSecurityRule_basic(t *testing.T) {
13-
14+
rInt := acctest.RandInt()
1415
resource.Test(t, resource.TestCase{
1516
PreCheck: func() { testAccPreCheck(t) },
1617
Providers: testAccProviders,
1718
CheckDestroy: testCheckAzureRMNetworkSecurityRuleDestroy,
1819
Steps: []resource.TestStep{
1920
{
20-
Config: testAccAzureRMNetworkSecurityRule_basic,
21+
Config: testAccAzureRMNetworkSecurityRule_basic(rInt),
2122
Check: resource.ComposeTestCheckFunc(
2223
testCheckAzureRMNetworkSecurityRuleExists("azurerm_network_security_rule.test"),
2324
),
@@ -27,14 +28,15 @@ func TestAccAzureRMNetworkSecurityRule_basic(t *testing.T) {
2728
}
2829

2930
func TestAccAzureRMNetworkSecurityRule_disappears(t *testing.T) {
31+
rInt := acctest.RandInt()
3032

3133
resource.Test(t, resource.TestCase{
3234
PreCheck: func() { testAccPreCheck(t) },
3335
Providers: testAccProviders,
3436
CheckDestroy: testCheckAzureRMNetworkSecurityRuleDestroy,
3537
Steps: []resource.TestStep{
3638
{
37-
Config: testAccAzureRMNetworkSecurityRule_basic,
39+
Config: testAccAzureRMNetworkSecurityRule_basic(rInt),
3840
Check: resource.ComposeTestCheckFunc(
3941
testCheckAzureRMNetworkSecurityRuleExists("azurerm_network_security_rule.test"),
4042
testCheckAzureRMNetworkSecurityRuleDisappears("azurerm_network_security_rule.test"),
@@ -46,21 +48,22 @@ func TestAccAzureRMNetworkSecurityRule_disappears(t *testing.T) {
4648
}
4749

4850
func TestAccAzureRMNetworkSecurityRule_addingRules(t *testing.T) {
51+
rInt := acctest.RandInt()
4952

5053
resource.Test(t, resource.TestCase{
5154
PreCheck: func() { testAccPreCheck(t) },
5255
Providers: testAccProviders,
5356
CheckDestroy: testCheckAzureRMNetworkSecurityRuleDestroy,
5457
Steps: []resource.TestStep{
5558
{
56-
Config: testAccAzureRMNetworkSecurityRule_updateBasic,
59+
Config: testAccAzureRMNetworkSecurityRule_updateBasic(rInt),
5760
Check: resource.ComposeTestCheckFunc(
5861
testCheckAzureRMNetworkSecurityRuleExists("azurerm_network_security_rule.test1"),
5962
),
6063
},
6164

6265
{
63-
Config: testAccAzureRMNetworkSecurityRule_updateExtraRule,
66+
Config: testAccAzureRMNetworkSecurityRule_updateExtraRule(rInt),
6467
Check: resource.ComposeTestCheckFunc(
6568
testCheckAzureRMNetworkSecurityRuleExists("azurerm_network_security_rule.test2"),
6669
),
@@ -152,7 +155,8 @@ func testCheckAzureRMNetworkSecurityRuleDestroy(s *terraform.State) error {
152155
return nil
153156
}
154157

155-
var testAccAzureRMNetworkSecurityRule_basic = `
158+
func testAccAzureRMNetworkSecurityRule_basic(rInt int) string {
159+
return fmt.Sprintf(`
156160
resource "azurerm_resource_group" "test" {
157161
name = "acceptanceTestResourceGroup1"
158162
location = "West US"
@@ -177,9 +181,11 @@ resource "azurerm_network_security_rule" "test" {
177181
resource_group_name = "${azurerm_resource_group.test.name}"
178182
network_security_group_name = "${azurerm_network_security_group.test.name}"
179183
}
180-
`
184+
`, rInt)
185+
}
181186

182-
var testAccAzureRMNetworkSecurityRule_updateBasic = `
187+
func testAccAzureRMNetworkSecurityRule_updateBasic(rInt int) string {
188+
return fmt.Sprintf(`
183189
resource "azurerm_resource_group" "test1" {
184190
name = "acceptanceTestResourceGroup2"
185191
location = "West US"
@@ -204,9 +210,11 @@ resource "azurerm_network_security_rule" "test1" {
204210
resource_group_name = "${azurerm_resource_group.test1.name}"
205211
network_security_group_name = "${azurerm_network_security_group.test1.name}"
206212
}
207-
`
213+
`, rInt)
214+
}
208215

209-
var testAccAzureRMNetworkSecurityRule_updateExtraRule = `
216+
func testAccAzureRMNetworkSecurityRule_updateExtraRule(rInt int) string {
217+
return fmt.Sprintf(`
210218
resource "azurerm_resource_group" "test1" {
211219
name = "acceptanceTestResourceGroup2"
212220
location = "West US"
@@ -245,4 +253,5 @@ resource "azurerm_network_security_rule" "test2" {
245253
resource_group_name = "${azurerm_resource_group.test1.name}"
246254
network_security_group_name = "${azurerm_network_security_group.test1.name}"
247255
}
248-
`
256+
`, rInt)
257+
}

0 commit comments

Comments
 (0)