all: make use of t.TempDir and t.Setenv

They were added in Go 1.15 and 1.17, respectively.
Now that we require Go 1.17 or later, use them.

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: Id114de6283c1fbadf7f30472f662a238d8a24305
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/537852
Unity-Result: CUEcueckoo <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>

Author: mvdan

cmd/cue/cmd/script_test.go

@@ -131,9 +131,7 @@ func TestX(t *testing.T) {
 		}
 	}
 
-	tmpdir, err := ioutil.TempDir("", "cue-script")
-	check(err)
-	defer os.Remove(tmpdir)
+	tmpdir := t.TempDir()
 
 	a, err := txtar.ParseFile(filepath.FromSlash(path))
 	check(err)

cue/context_test.go

@@ -16,7 +16,6 @@ package cue_test
 
 import (
 	"fmt"
-	"io/ioutil"
 	"testing"
 
 	"cuelang.org/go/cue"
@@ -99,7 +98,7 @@ bar: [
 `
 
 	a := txtar.Parse([]byte(in))
-	dir, _ := ioutil.TempDir("", "*")
+	dir := t.TempDir()
 	instance := cuetxtar.Load(a, dir)[0]
 	if instance.Err != nil {
 		t.Fatal(instance.Err)
@@ -125,7 +124,7 @@ bar: [
 `
 
 	a := txtar.Parse([]byte(in))
-	dir, _ := ioutil.TempDir("", "*")
+	dir := t.TempDir()
 	instance := cuetxtar.Load(a, dir)[0]
 
 	// Normally, this should be checked, however, this is explicitly

cue/load/tags_test.go

@@ -16,8 +16,6 @@ package load
 
 import (
 	"bytes"
-	"io/ioutil"
-	"os"
 	"path/filepath"
 	"testing"
 
@@ -43,8 +41,7 @@ func stringVar(s string) TagVar {
 }
 
 func TestTags(t *testing.T) {
-	dir, _ := ioutil.TempDir("", "")
-	defer os.RemoveAll(dir)
+	dir := t.TempDir()
 
 	testCases := []struct {
 		in  string

cue/query_test.go

@@ -16,7 +16,6 @@ package cue_test
 
 import (
 	"bytes"
-	"io/ioutil"
 	"testing"
 
 	"cuelang.org/go/cue"
@@ -163,7 +162,7 @@ _d: 3
 		`
 
 	a := txtar.Parse([]byte(in))
-	dir, _ := ioutil.TempDir("", "*")
+	dir := t.TempDir()
 	instance := cuetxtar.Load(a, dir)[0]
 	if instance.Err != nil {
 		t.Fatal(instance.Err)

internal/cuetest/cuetest_test.go

@@ -1,7 +1,6 @@
 package cuetest
 
 import (
-	"os"
 	"testing"
 )
 
@@ -30,7 +29,7 @@ func TestCondition(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			os.Setenv(envNonIssues, c.env)
+			t.Setenv(envNonIssues, c.env)
 			got, err := Condition(c.con)
 			if got != c.want {
 				t.Errorf("expected %v; got %v", c.want, got)
@@ -85,7 +84,7 @@ func TestCheckIssueCondition(t *testing.T) {
 	}
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			os.Setenv(envNonIssues, c.env)
+			t.Setenv(envNonIssues, c.env)
 			isIssue, nonIssue, err := checkIssueCondition(c.con)
 			if isIssue != c.isIssue {
 				t.Errorf("expected isIssue %v; got %v", c.isIssue, isIssue)

pkg/path/path_windows_test.go

@@ -48,11 +48,7 @@ func testWinSplitListTestIsValid(t *testing.T, ti int, tt SplitListTest,
 		perm    = 0700
 	)
 
-	tmp, err := ioutil.TempDir("", "testWinSplitListTestIsValid")
-	if err != nil {
-		t.Fatalf("TempDir failed: %v", err)
-	}
-	defer goos.RemoveAll(tmp)
+	tmp := t.TempDir()
 
 	for i, d := range tt.result {
 		if d == "" {
@@ -68,12 +64,12 @@ func testWinSplitListTestIsValid(t *testing.T, ti int, tt SplitListTest,
 			t.Errorf("%d,%d: %#q already exists", ti, i, d)
 			return
 		}
-		if err = goos.MkdirAll(dd, perm); err != nil {
+		if err := goos.MkdirAll(dd, perm); err != nil {
 			t.Errorf("%d,%d: MkdirAll(%#q) failed: %v", ti, i, dd, err)
 			return
 		}
 		fn, data := Join([]string{dd, cmdfile}, Windows), []byte("@echo "+d+"\r\n")
-		if err = ioutil.WriteFile(fn, data, perm); err != nil {
+		if err := ioutil.WriteFile(fn, data, perm); err != nil {
 			t.Errorf("%d,%d: WriteFile(%#q) failed: %v", ti, i, fn, err)
 			return
 		}

pkg/tool/os/env_test.go

@@ -41,7 +41,7 @@ func TestGetenv(t *testing.T) {
 		{"CUEOSTESTNUMD", "not a num"},
 		{"CUEOSTESTMULTI", "10"},
 	} {
-		os.Setenv(p[0], p[1])
+		t.Setenv(p[0], p[1])
 	}
 
 	config := `{