github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #117428 from cbandy/etcd-testing-setenv

Browse Source 
Replace os.Setenv with testing.T.Setenv in tests
This commit is contained in:
Kubernetes Prow Robot
2023-05-13 12:29:26 -07:00
committed by GitHub
parent 6ca4f541d5 f3b9e0ddc9
commit 4f5a2256f9
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
cluster/images/etcd/migrate/options_test.go
View File

@@ -23,13 +23,13 @@ import (
func setEnvVar(t *testing.T, env, val string, exists bool) {
if exists {
if err := os.Setenv(env, val); err != nil {
t.Errorf("could't set env %s: %v", env, err)
t.Setenv(env, val)
} else if prev, ok := os.LookupEnv(env); ok {
t.Cleanup(func() { os.Setenv(env, prev) })
if err := os.Unsetenv(env); err != nil {
t.Errorf("couldn't unset env %s: %v", env, err)
}
return
}
if err := os.Unsetenv(env); err != nil {
t.Errorf("couldn't unset env %s: %v", env, err)
}
}
@@ -69,12 +69,6 @@ func TestFallbackToEnv(t *testing.T) {
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
prevVal, prevOk := os.LookupEnv(test.env)
defer func() {
// preserve the original behavior
setEnvVar(t, test.env, prevVal, prevOk)
}()
setEnvVar(t, test.env, test.value, test.valueSet)
value, err := fallbackToEnv("some-flag", test.env)
if test.expectedError {
@@ -130,12 +124,6 @@ func TestFallbackToEnvWithDefault(t *testing.T) {
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
prevVal, prevOk := os.LookupEnv(test.env)
defer func() {
// preserve the original behavior
setEnvVar(t, test.env, prevVal, prevOk)
}()
setEnvVar(t, test.env, test.value, test.valueSet)
value := fallbackToEnvWithDefault("some-flag", test.env, test.defaultValue)
if value != test.expectedValue {