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

Merge pull request #117423 from cbandy/test-testing-setenv

Browse Source 
Replace os.Setenv with testing.T.Setenv in tests
This commit is contained in:
Kubernetes Prow Robot
2023-06-06 10:20:12 -07:00
committed by GitHub
parent 6f116dc4d5 2e76ac31fd
commit fea314a89a
4 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/conformance/image/go-runner/env_test.go
View File

@@ -32,7 +32,7 @@ func TestEnv(t *testing.T) {
desc: "OS env", desc: "OS env",
env: &osEnv{}, env: &osEnv{},
preHook: func() { preHook: func() {
os.Setenv("key1", "1") t.Setenv("key1", "1")
}, },
expect: map[string]string{"key1": "1"}, expect: map[string]string{"key1": "1"},
}, { }, {

6
test/integration/serving/serving_test.go
View File

@@ -83,10 +83,8 @@ func TestComponentSecureServingAndAuth(t *testing.T) {
// Insulate this test from picking up in-cluster config when run inside a pod // Insulate this test from picking up in-cluster config when run inside a pod
// We can't assume we have permissions to write to /var/run/secrets/... from a unit test to mock in-cluster config for testing // We can't assume we have permissions to write to /var/run/secrets/... from a unit test to mock in-cluster config for testing
originalHost := os.Getenv("KUBERNETES_SERVICE_HOST") if len(os.Getenv("KUBERNETES_SERVICE_HOST")) > 0 {
if len(originalHost) > 0 { t.Setenv("KUBERNETES_SERVICE_HOST", "")
os.Setenv("KUBERNETES_SERVICE_HOST", "")
defer os.Setenv("KUBERNETES_SERVICE_HOST", originalHost)
} }
// authenticate to apiserver via bearer token // authenticate to apiserver via bearer token

6
test/integration/volumescheduling/volume_binding_test.go
View File

@@ -21,7 +21,6 @@ package volumescheduling
import ( import (
"context" "context"
"fmt" "fmt"
"os"
"strconv" "strconv"
"strings" "strings"
"testing" "testing"
@@ -427,10 +426,7 @@ func testVolumeBindingStress(t *testing.T, schedulerResyncPeriod time.Duration,
// Set max volume limit to the number of PVCs the test will create // Set max volume limit to the number of PVCs the test will create
// TODO: remove when max volume limit allows setting through storageclass // TODO: remove when max volume limit allows setting through storageclass
if err := os.Setenv(nodevolumelimits.KubeMaxPDVols, fmt.Sprintf("%v", podLimit*volsPerPod)); err != nil { t.Setenv(nodevolumelimits.KubeMaxPDVols, fmt.Sprintf("%v", podLimit*volsPerPod))
t.Fatalf("failed to set max pd limit: %v", err)
}
defer os.Unsetenv(nodevolumelimits.KubeMaxPDVols)
scName := &classWait scName := &classWait
if dynamic { if dynamic {

9
test/typecheck/main_test.go
View File

@@ -32,7 +32,7 @@ var goBinary = flag.String("go", "", "path to a `go` binary")
func TestVerify(t *testing.T) { func TestVerify(t *testing.T) {
// x/tools/packages is going to literally exec `go`, so it needs some // x/tools/packages is going to literally exec `go`, so it needs some
// setup. // setup.
setEnvVars() setEnvVars(t)
tcs := []struct { tcs := []struct {
path string path string
@@ -57,17 +57,18 @@ func TestVerify(t *testing.T) {
} }
} }
func setEnvVars() { func setEnvVars(t testing.TB) {
t.Helper()
if *goBinary != "" { if *goBinary != "" {
newPath := filepath.Dir(*goBinary) newPath := filepath.Dir(*goBinary)
curPath := os.Getenv("PATH") curPath := os.Getenv("PATH")
if curPath != "" { if curPath != "" {
newPath = newPath + ":" + curPath newPath = newPath + ":" + curPath
} }
os.Setenv("PATH", newPath) t.Setenv("PATH", newPath)
} }
if os.Getenv("HOME") == "" { if os.Getenv("HOME") == "" {
os.Setenv("HOME", "/tmp") t.Setenv("HOME", "/tmp")
} }
} }