github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use t.Setenv instead of os.Setenv

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko 2022-04-01 13:53:17 -07:00
parent 887615c7d0
commit 2d59a39445
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archive/compression/compression_test.go
View File

@ -135,9 +135,7 @@ func TestDetectPigz(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
oldPath := os.Getenv("PATH") t.Setenv("PATH", tempPath)
os.Setenv("PATH", tempPath)
defer os.Setenv("PATH", oldPath)
if pigzPath := detectPigz(); pigzPath == "" { if pigzPath := detectPigz(); pigzPath == "" {
t.Fatal("failed to detect pigz path") t.Fatal("failed to detect pigz path")
@ -145,8 +143,7 @@ func TestDetectPigz(t *testing.T) {
t.Fatalf("wrong pigz found: %s != %s", pigzPath, fullPath) t.Fatalf("wrong pigz found: %s != %s", pigzPath, fullPath)
} }
os.Setenv(disablePigzEnv, "1") t.Setenv(disablePigzEnv, "1")
defer os.Unsetenv(disablePigzEnv)
if pigzPath := detectPigz(); pigzPath != "" { if pigzPath := detectPigz(); pigzPath != "" {
t.Fatalf("disable via %s doesn't work", disablePigzEnv) t.Fatalf("disable via %s doesn't work", disablePigzEnv)

6
namespaces/context_test.go
View File

@ -18,7 +18,6 @@ package namespaces
import ( import (
"context" "context"
"os"
"testing" "testing"
) )
@ -47,9 +46,6 @@ func TestContext(t *testing.T) {
} }
func TestNamespaceFromEnv(t *testing.T) { func TestNamespaceFromEnv(t *testing.T) {
oldenv := os.Getenv(NamespaceEnvVar)
defer os.Setenv(NamespaceEnvVar, oldenv) // restore old env var
ctx := context.Background() ctx := context.Background()
namespace, ok := Namespace(ctx) namespace, ok := Namespace(ctx)
if ok { if ok {
@ -61,7 +57,7 @@ func TestNamespaceFromEnv(t *testing.T) {
} }
expected := "test-namespace" expected := "test-namespace"
os.Setenv(NamespaceEnvVar, expected) t.Setenv(NamespaceEnvVar, expected)
nctx := NamespaceFromEnv(ctx) nctx := NamespaceFromEnv(ctx)
namespace, ok = Namespace(nctx) namespace, ok = Namespace(nctx)

5
runtime/v2/shim/shim_test.go
View File

@ -18,7 +18,6 @@ package shim
import ( import (
"context" "context"
"os"
"runtime" "runtime"
"testing" "testing"
) )
@ -27,7 +26,7 @@ func TestRuntimeWithEmptyMaxEnvProcs(t *testing.T) {
var oldGoMaxProcs = runtime.GOMAXPROCS(0) var oldGoMaxProcs = runtime.GOMAXPROCS(0)
defer runtime.GOMAXPROCS(oldGoMaxProcs) defer runtime.GOMAXPROCS(oldGoMaxProcs)
os.Setenv("GOMAXPROCS", "") t.Setenv("GOMAXPROCS", "")
setRuntime() setRuntime()
var currentGoMaxProcs = runtime.GOMAXPROCS(0) var currentGoMaxProcs = runtime.GOMAXPROCS(0)
@ -37,7 +36,7 @@ func TestRuntimeWithEmptyMaxEnvProcs(t *testing.T) {
} }
func TestRuntimeWithNonEmptyMaxEnvProcs(t *testing.T) { func TestRuntimeWithNonEmptyMaxEnvProcs(t *testing.T) {
os.Setenv("GOMAXPROCS", "not_empty") t.Setenv("GOMAXPROCS", "not_empty")
setRuntime() setRuntime()
var oldGoMaxProcs2 = runtime.GOMAXPROCS(0) var oldGoMaxProcs2 = runtime.GOMAXPROCS(0)
if oldGoMaxProcs2 != runtime.NumCPU() { if oldGoMaxProcs2 != runtime.NumCPU() {