IntenseWebs/opentofu
3
0
Fork 0
mirror of https://github.com/opentofu/opentofu.git synced 2024-12-29 10:21:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #30776 from hashicorp/sebasslash/resolve-flaky-env-var-test

Browse Source 
Fix a flaky test manipulating environment variables
This commit is contained in:
Sebastian Rivera 2022-03-31 10:28:26 -04:00 committed by GitHub
commit 6ce6955a4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
internal/cloud/backend_test.go
View File

@ -178,21 +178,27 @@ func TestCloud_PrepareConfigWithEnvVars(t *testing.T) {
}
for name, tc := range cases {
s := testServer(t)
b := New(testDisco(s))
t.Run(name, func(t *testing.T) {
s := testServer(t)
b := New(testDisco(s))
for k, v := range tc.vars {
os.Setenv(k, v)
defer os.Unsetenv(k)
}
_, valDiags := b.PrepareConfig(tc.config)
if valDiags.Err() != nil && tc.expectedErr != "" {
actualErr := valDiags.Err().Error()
if !strings.Contains(actualErr, tc.expectedErr) {
t.Fatalf("%s: unexpected validation result: %v", name, valDiags.Err())
for k, v := range tc.vars {
os.Setenv(k, v)
}
}
t.Cleanup(func() {
for k := range tc.vars {
os.Unsetenv(k)
}
})
_, valDiags := b.PrepareConfig(tc.config)
if valDiags.Err() != nil && tc.expectedErr != "" {
actualErr := valDiags.Err().Error()
if !strings.Contains(actualErr, tc.expectedErr) {
t.Fatalf("%s: unexpected validation result: %v", name, valDiags.Err())
}
}
})
}
}
@ -266,31 +272,38 @@ func TestCloud_configWithEnvVars(t *testing.T) {
}
for name, tc := range cases {
s := testServer(t)
b := New(testDisco(s))
t.Run(name, func(t *testing.T) {
s := testServer(t)
b := New(testDisco(s))
for k, v := range tc.vars {
os.Setenv(k, v)
defer os.Unsetenv(k)
}
for k, v := range tc.vars {
os.Setenv(k, v)
}
_, valDiags := b.PrepareConfig(tc.config)
if valDiags.Err() != nil {
t.Fatalf("%s: unexpected validation result: %v", name, valDiags.Err())
}
t.Cleanup(func() {
for k := range tc.vars {
os.Unsetenv(k)
}
})
diags := b.Configure(tc.config)
if diags.Err() != nil {
t.Fatalf("%s: unexpected configuration result: %v", name, valDiags.Err())
}
_, valDiags := b.PrepareConfig(tc.config)
if valDiags.Err() != nil {
t.Fatalf("%s: unexpected validation result: %v", name, valDiags.Err())
}
if tc.expectedOrganization != "" && tc.expectedOrganization != b.organization {
t.Fatalf("%s: organization not valid: %s, expected: %s", name, b.organization, tc.expectedOrganization)
}
diags := b.Configure(tc.config)
if diags.Err() != nil {
t.Fatalf("%s: unexpected configuration result: %v", name, diags.Err())
}
if tc.expectedHostname != "" && tc.expectedHostname != b.hostname {
t.Fatalf("%s: hostname not valid: %s, expected: %s", name, b.hostname, tc.expectedHostname)
}
if tc.expectedOrganization != "" && tc.expectedOrganization != b.organization {
t.Fatalf("%s: organization not valid: %s, expected: %s", name, b.organization, tc.expectedOrganization)
}
if tc.expectedHostname != "" && tc.expectedHostname != b.hostname {
t.Fatalf("%s: hostname not valid: %s, expected: %s", name, b.hostname, tc.expectedHostname)
}
})
}
}