switch tenv with usetesting

Author: dmathieu

.golangci.yml

@@ -131,10 +131,10 @@ linters:
     - misspell
     - revive
     - staticcheck
-    - tenv
     - unconvert
     - unused
     - unparam
+    - usetesting
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source

crosslink/internal/crosslink_test.go

@@ -134,10 +134,8 @@ func TestCrosslink(t *testing.T) {
 			err = Crosslink(test.config)
 
 			if assert.NoError(t, err, "error message on execution %s") {
-
 				for modFilePath, modFilesExpected := range test.expected {
 					modFileActual, err := os.ReadFile(filepath.Clean(filepath.Join(tmpRootDir, modFilePath)))
-
 					if err != nil {
 						t.Fatalf("error reading actual mod files: %v", err)
 					}
@@ -167,7 +165,6 @@ func TestCrosslink(t *testing.T) {
 					}
 				}
 			}
-
 		})
 	}
 }
@@ -256,7 +253,6 @@ func TestOverwrite(t *testing.T) {
 
 				for modFilePath, modFilesExpected := range test.expected {
 					modFileActual, err := os.ReadFile(filepath.Clean(filepath.Join(tmpRootDir, modFilePath)))
-
 					if err != nil {
 						t.Fatalf("error reading actual mod files: %v", err)
 					}
@@ -286,14 +282,12 @@ func TestOverwrite(t *testing.T) {
 					}
 				}
 			}
-
 		})
 	}
 	err := lg.Sync()
 	if err != nil {
 		fmt.Printf("failed to sync logger:  %v", err)
 	}
-
 }
 
 // Testing exclude functionality for prune, overwrite, and no overwrite.
@@ -372,7 +366,6 @@ func TestExclude(t *testing.T) {
 
 				for modFilePath, modFilesExpected := range modFilesExpected {
 					modFileActual, err := os.ReadFile(filepath.Clean(modFilePath))
-
 					if err != nil {
 						t.Fatalf("TestCase: %s, error reading actual mod files: %v", test.testCase, err)
 					}
@@ -410,13 +403,11 @@ func TestBadRootPath(t *testing.T) {
 	lg, _ := zap.NewDevelopment()
 	tests := []struct {
 		testName      string
-		mockDir       string
 		setConfigPath bool
 		config        RunConfig
 	}{
 		{
 			testName:      "noGoMod",
-			mockDir:       "noGoMod",
 			setConfigPath: true,
 			config: RunConfig{
 				Logger: lg,
@@ -426,22 +417,18 @@ func TestBadRootPath(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.testName, func(t *testing.T) {
-			tmpRootDir, err := os.MkdirTemp(testDataDir, test.mockDir)
-			if err != nil {
-				t.Fatalf("Failed to create temp dir %v", err)
-			}
+			tmpRootDir := t.TempDir()
 			if test.setConfigPath {
 				test.config.RootPath = tmpRootDir
 			}
 
 			t.Cleanup(func() { os.RemoveAll(tmpRootDir) })
-			err = Crosslink(test.config)
+			err := Crosslink(test.config)
 			assert.Error(t, err)
 			err = Prune(test.config)
 			assert.Error(t, err)
 		})
 	}
-
 }
 
 // Testing skipping specified go modules.
@@ -526,7 +513,6 @@ func TestSkip(t *testing.T) {
 					}
 				}
 				modFileActual, err := os.ReadFile(filepath.Clean(modFilePath))
-
 				if err != nil {
 					t.Fatalf("TestCase: %s, error reading actual mod files: %v", test.testCase, err)
 				}

multimod/internal/sync/sync_test.go

@@ -45,12 +45,7 @@ func TestNewSync(t *testing.T) {
 	myVersioningFilename := filepath.Join(versionsYamlDir, "versions_valid.yaml")
 	otherVersioningFilename := filepath.Join(versionsYamlDir, "other_versions_valid.yaml")
 
-	tmpRootDir, err := os.MkdirTemp(testDataDir, testName)
-	if err != nil {
-		t.Fatal("creating temp dir:", err)
-	}
-
-	defer os.RemoveAll(tmpRootDir)
+	tmpRootDir := t.TempDir()
 
 	modFiles := map[string][]byte{
 		filepath.Join(tmpRootDir, "my", "test", "test1", "go.mod"): []byte("module go.opentelemetry.io/build-tools/multimod/internal/sync/test/test1\n\n" +
@@ -273,12 +268,7 @@ func TestUpdateAllGoModFilesWithCommitHash(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tmpRootDir, err := os.MkdirTemp(testDataDir, testName)
-		if err != nil {
-			t.Fatal("creating temp dir:", err)
-		}
-
-		defer os.RemoveAll(tmpRootDir)
+		tmpRootDir := t.TempDir()
 
 		modFiles := map[string][]byte{
 			filepath.Join(tmpRootDir, "my", "test", "test1", "go.mod"): []byte("module go.opentelemetry.io/build-tools/multimod/internal/sync/test/test1\n\n" +
@@ -475,12 +465,7 @@ func TestUpdateAllGoModFiles(t *testing.T) {
 	}
 
 	for _, tc := range testCases {
-		tmpRootDir, err := os.MkdirTemp(testDataDir, testName)
-		if err != nil {
-			t.Fatal("creating temp dir:", err)
-		}
-
-		defer os.RemoveAll(tmpRootDir)
+		tmpRootDir := t.TempDir()
 
 		modFiles := map[string][]byte{
 			filepath.Join(tmpRootDir, "my", "test", "test1", "go.mod"): []byte("module go.opentelemetry.io/build-tools/multimod/internal/sync/test/test1\n\n" +

semconvgen/generator_test.go

@@ -57,7 +57,7 @@ func TestCapitalizations(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			tmpfile, err := os.CreateTemp("", "test")
+			tmpfile, err := os.CreateTemp(t.TempDir(), "test")
 			if err != nil {
 				t.Fatal(err)
 			}