Skip to content

Commit 282e597

Browse files
mrollamrolla
authored
Fix tests failing on CI (#29)
1 parent e79e049 commit 282e597

39 files changed

+4065
-6636
lines changed

‎circleci/provider_test.go

+12-13
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,31 @@ import (
88
"github.com/hashicorp/terraform/terraform"
99
)
1010

11-
var providerOrgTestProvider *schema.Provider
12-
var providerOrgTestProviders map[string]terraform.ResourceProvider
11+
var testAccNoOrgProvider *schema.Provider
12+
var testAccNoOrgProviders map[string]terraform.ResourceProvider
1313

14-
var resourceOrgTestProvider *schema.Provider
15-
var resourceOrgTestProviders map[string]terraform.ResourceProvider
14+
var testAccOrgProvider *schema.Provider
15+
var testAccOrgProviders map[string]terraform.ResourceProvider
1616

1717
func init() {
18-
resourceOrgTestProvider = Provider().(*schema.Provider)
19-
resourceOrgTestProviders = map[string]terraform.ResourceProvider{
20-
"circleci": resourceOrgTestProvider,
18+
testAccNoOrgProvider = Provider().(*schema.Provider)
19+
testAccNoOrgProviders = map[string]terraform.ResourceProvider{
20+
"circleci": testAccNoOrgProvider,
2121
}
2222

23-
providerOrgTestProvider = Provider().(*schema.Provider)
24-
providerOrgTestProvider.Schema["organization"] = &schema.Schema{
23+
testAccOrgProvider = Provider().(*schema.Provider)
24+
testAccOrgProvider.Schema["organization"] = &schema.Schema{
2525
Type: schema.TypeString,
2626
Optional: true,
2727
DefaultFunc: schema.EnvDefaultFunc("TEST_CIRCLECI_ORGANIZATION", nil),
2828
Description: "The CircleCI organization.",
2929
}
30-
providerOrgTestProviders = map[string]terraform.ResourceProvider{
31-
"circleci": providerOrgTestProvider,
30+
testAccOrgProviders = map[string]terraform.ResourceProvider{
31+
"circleci": testAccOrgProvider,
3232
}
3333
}
3434

35-
func testPreCheck(t *testing.T) {
36-
35+
func testAccPreCheck(t *testing.T) {
3736
if v := os.Getenv("CIRCLECI_TOKEN"); v == "" {
3837
t.Fatal("CIRCLECI_TOKEN must be set for acceptance tests")
3938
}

‎circleci/resource_circleci_environment_variable_test.go

+45-46
Original file line numberDiff line numberDiff line change
@@ -13,40 +13,39 @@ import (
1313
"github.com/hashicorp/terraform/terraform"
1414
)
1515

16-
func TestCircleCIEnvironmentVariableOrganizationNotSet(t *testing.T) {
16+
func TestAccCircleCIEnvironmentVariableOrganizationNotSet(t *testing.T) {
1717
project := "TEST_" + acctest.RandString(8)
1818
envName := "TEST_" + acctest.RandString(8)
1919

2020
resource.Test(t, resource.TestCase{
2121
PreCheck: func() {
22-
testPreCheck(t)
22+
testAccPreCheck(t)
2323
},
24-
Providers: resourceOrgTestProviders,
25-
IsUnitTest: true,
24+
Providers: testAccNoOrgProviders,
2625
Steps: []resource.TestStep{
2726
{
28-
Config: testCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test"),
27+
Config: testAccCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test"),
2928
ExpectError: regexp.MustCompile("organization has not been set for environment variable .*"),
3029
},
3130
},
3231
})
3332
}
3433

35-
func TestCircleCIEnvironmentVariableCreateThenUpdateProviderOrg(t *testing.T) {
34+
func TestAccCircleCIEnvironmentVariableCreateThenUpdateProviderOrg(t *testing.T) {
3635
project := os.Getenv("CIRCLECI_PROJECT")
3736
envName := "TEST_" + acctest.RandString(8)
3837
resourceName := "circleci_environment_variable." + envName
3938
organization := os.Getenv("TEST_CIRCLECI_ORGANIZATION")
4039

4140
resource.Test(t, resource.TestCase{
4241
PreCheck: func() {
43-
testPreCheck(t)
42+
testAccPreCheck(t)
4443
},
45-
Providers: providerOrgTestProviders,
46-
CheckDestroy: testCircleCIEnvironmentVariableProviderOrgCheckDestroy,
44+
Providers: testAccOrgProviders,
45+
CheckDestroy: testAccCircleCIEnvironmentVariableProviderOrgCheckDestroy,
4746
Steps: []resource.TestStep{
4847
{
49-
Config: testCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test"),
48+
Config: testAccCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test"),
5049
Check: resource.ComposeTestCheckFunc(
5150
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
5251
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -55,7 +54,7 @@ func TestCircleCIEnvironmentVariableCreateThenUpdateProviderOrg(t *testing.T) {
5554
),
5655
},
5756
{
58-
Config: testCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test-again"),
57+
Config: testAccCircleCIEnvironmentVariableConfigProviderOrg(project, envName, "value-for-the-test-again"),
5958
Check: resource.ComposeTestCheckFunc(
6059
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
6160
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -67,7 +66,7 @@ func TestCircleCIEnvironmentVariableCreateThenUpdateProviderOrg(t *testing.T) {
6766
})
6867
}
6968

70-
func TestCircleCIEnvironmentVariableCreateThenUpdateResourceOrg(t *testing.T) {
69+
func TestAccCircleCIEnvironmentVariableCreateThenUpdateResourceOrg(t *testing.T) {
7170
project := os.Getenv("CIRCLECI_PROJECT")
7271
organization := os.Getenv("TEST_CIRCLECI_ORGANIZATION")
7372
envName := "TEST_" + acctest.RandString(8)
@@ -76,13 +75,13 @@ func TestCircleCIEnvironmentVariableCreateThenUpdateResourceOrg(t *testing.T) {
7675

7776
resource.Test(t, resource.TestCase{
7877
PreCheck: func() {
79-
testPreCheck(t)
78+
testAccPreCheck(t)
8079
},
81-
Providers: resourceOrgTestProviders,
82-
CheckDestroy: testCircleCIEnvironmentVariableResourceOrgCheckDestroy,
80+
Providers: testAccNoOrgProviders,
81+
CheckDestroy: testAccCircleCIEnvironmentVariableResourceOrgCheckDestroy,
8382
Steps: []resource.TestStep{
8483
{
85-
Config: testCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
84+
Config: testAccCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
8685
Check: resource.ComposeTestCheckFunc(
8786
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
8887
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -91,7 +90,7 @@ func TestCircleCIEnvironmentVariableCreateThenUpdateResourceOrg(t *testing.T) {
9190
),
9291
},
9392
{
94-
Config: testCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test-again"),
93+
Config: testAccCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test-again"),
9594
Check: resource.ComposeTestCheckFunc(
9695
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
9796
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -103,7 +102,7 @@ func TestCircleCIEnvironmentVariableCreateThenUpdateResourceOrg(t *testing.T) {
103102
})
104103
}
105104

106-
func TestCircleCIEnvironmentVariableCreateAlreadyExists(t *testing.T) {
105+
func TestAccCircleCIEnvironmentVariableCreateAlreadyExists(t *testing.T) {
107106
project := os.Getenv("CIRCLECI_PROJECT")
108107
envName := "TEST_" + acctest.RandString(8)
109108
envValue := acctest.RandString(8)
@@ -112,14 +111,14 @@ func TestCircleCIEnvironmentVariableCreateAlreadyExists(t *testing.T) {
112111
resourceName := "circleci_environment_variable." + envName
113112

114113
resource.Test(t, resource.TestCase{
115-
Providers: providerOrgTestProviders,
114+
Providers: testAccOrgProviders,
116115
PreCheck: func() {
117-
testPreCheck(t)
116+
testAccPreCheck(t)
118117
},
119-
CheckDestroy: testCircleCIEnvironmentVariableProviderOrgCheckDestroy,
118+
CheckDestroy: testAccCircleCIEnvironmentVariableProviderOrgCheckDestroy,
120119
Steps: []resource.TestStep{
121120
{
122-
Config: testCircleCIEnvironmentVariableConfigProviderOrg(project, envName, envValue),
121+
Config: testAccCircleCIEnvironmentVariableConfigProviderOrg(project, envName, envValue),
123122
Check: resource.ComposeTestCheckFunc(
124123
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
125124
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -128,28 +127,28 @@ func TestCircleCIEnvironmentVariableCreateAlreadyExists(t *testing.T) {
128127
),
129128
},
130129
{
131-
Config: testCircleCIEnvironmentVariableConfigIdentical(project, envName, envValue),
130+
Config: testAccCircleCIEnvironmentVariableConfigIdentical(project, envName, envValue),
132131
ExpectError: regexp.MustCompile("already exists"),
133132
},
134133
},
135134
})
136135
}
137136

138-
func TestCircleCIEnvironmentVariableImportProviderOrg(t *testing.T) {
137+
func TestAccCircleCIEnvironmentVariableImportProviderOrg(t *testing.T) {
139138
project := os.Getenv("CIRCLECI_PROJECT")
140139
envName := "TEST_" + acctest.RandString(8)
141140
resourceName := "circleci_environment_variable." + envName
142141
organization := os.Getenv("TEST_CIRCLECI_ORGANIZATION")
143142

144143
resource.Test(t, resource.TestCase{
145144
PreCheck: func() {
146-
testPreCheck(t)
145+
testAccPreCheck(t)
147146
},
148-
Providers: providerOrgTestProviders,
149-
CheckDestroy: testCircleCIEnvironmentVariableProviderOrgCheckDestroy,
147+
Providers: testAccOrgProviders,
148+
CheckDestroy: testAccCircleCIEnvironmentVariableProviderOrgCheckDestroy,
150149
Steps: []resource.TestStep{
151150
{
152-
Config: testCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
151+
Config: testAccCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
153152
Check: resource.ComposeTestCheckFunc(
154153
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
155154
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -169,7 +168,7 @@ func TestCircleCIEnvironmentVariableImportProviderOrg(t *testing.T) {
169168
})
170169
}
171170

172-
func TestCircleCIEnvironmentVariableImportResourceOrg(t *testing.T) {
171+
func TestAccCircleCIEnvironmentVariableImportResourceOrg(t *testing.T) {
173172
project := os.Getenv("CIRCLECI_PROJECT")
174173
organization := os.Getenv("TEST_CIRCLECI_ORGANIZATION")
175174
envName := "TEST_" + acctest.RandString(8)
@@ -178,13 +177,13 @@ func TestCircleCIEnvironmentVariableImportResourceOrg(t *testing.T) {
178177

179178
resource.Test(t, resource.TestCase{
180179
PreCheck: func() {
181-
testPreCheck(t)
180+
testAccPreCheck(t)
182181
},
183-
Providers: resourceOrgTestProviders,
184-
CheckDestroy: testCircleCIEnvironmentVariableResourceOrgCheckDestroy,
182+
Providers: testAccNoOrgProviders,
183+
CheckDestroy: testAccCircleCIEnvironmentVariableResourceOrgCheckDestroy,
185184
Steps: []resource.TestStep{
186185
{
187-
Config: testCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
186+
Config: testAccCircleCIEnvironmentVariableConfigResourceOrg(organization, project, envName, "value-for-the-test"),
188187
Check: resource.ComposeTestCheckFunc(
189188
resource.TestCheckResourceAttr(resourceName, "id", fmt.Sprintf("%s.%s.%s", organization, project, envName)),
190189
resource.TestCheckResourceAttr(resourceName, "project", project),
@@ -290,17 +289,17 @@ func TestCircleCIEnvironmentVariableProviderOrgStateUpgradeV0(t *testing.T) {
290289
assert.Equal(t, expected, actual)
291290
}
292291

293-
func testCircleCIEnvironmentVariableResourceOrgCheckDestroy(s *terraform.State) error {
294-
providerClient := resourceOrgTestProvider.Meta().(*ProviderClient)
295-
return testCircleCIEnvironmentVariableCheckDestroy(providerClient, s)
292+
func testAccCircleCIEnvironmentVariableResourceOrgCheckDestroy(s *terraform.State) error {
293+
providerClient := testAccNoOrgProvider.Meta().(*ProviderClient)
294+
return testAccCircleCIEnvironmentVariableCheckDestroy(providerClient, s)
296295
}
297296

298-
func testCircleCIEnvironmentVariableProviderOrgCheckDestroy(s *terraform.State) error {
299-
providerClient := providerOrgTestProvider.Meta().(*ProviderClient)
300-
return testCircleCIEnvironmentVariableCheckDestroy(providerClient, s)
297+
func testAccCircleCIEnvironmentVariableProviderOrgCheckDestroy(s *terraform.State) error {
298+
providerClient := testAccOrgProvider.Meta().(*ProviderClient)
299+
return testAccCircleCIEnvironmentVariableCheckDestroy(providerClient, s)
301300
}
302301

303-
func testCircleCIEnvironmentVariableCheckDestroy(providerClient *ProviderClient, s *terraform.State) error {
302+
func testAccCircleCIEnvironmentVariableCheckDestroy(providerClient *ProviderClient, s *terraform.State) error {
304303
for _, rs := range s.RootModule().Resources {
305304
if rs.Type != "circleci_environment_variable" {
306305
continue
@@ -324,7 +323,7 @@ func testCircleCIEnvironmentVariableCheckDestroy(providerClient *ProviderClient,
324323
return nil
325324
}
326325

327-
func testCircleCIEnvironmentVariableConfigProviderOrg(project, name, value string) string {
326+
func testAccCircleCIEnvironmentVariableConfigProviderOrg(project, name, value string) string {
328327
return fmt.Sprintf(`
329328
resource "circleci_environment_variable" "%[2]s" {
330329
project = "%[1]s"
@@ -333,17 +332,17 @@ resource "circleci_environment_variable" "%[2]s" {
333332
}`, project, name, value)
334333
}
335334

336-
func testCircleCIEnvironmentVariableConfigResourceOrg(organization, project, name, value string) string {
335+
func testAccCircleCIEnvironmentVariableConfigResourceOrg(organization, project, name, value string) string {
337336
return fmt.Sprintf(`
338337
resource "circleci_environment_variable" "%[2]s" {
339338
organization = "%[4]s"
340-
project = "%[1]s"
341-
name = "%[2]s"
342-
value = "%[3]s"
339+
project = "%[1]s"
340+
name = "%[2]s"
341+
value = "%[3]s"
343342
}`, project, name, value, organization)
344343
}
345344

346-
func testCircleCIEnvironmentVariableConfigIdentical(project, name, value string) string {
345+
func testAccCircleCIEnvironmentVariableConfigIdentical(project, name, value string) string {
347346
return fmt.Sprintf(`
348347
resource "circleci_environment_variable" "%[2]s" {
349348
project = "%[1]s"

0 commit comments

Comments
 (0)