From ead86d4e2c9f973e95330fa47269f9af0e991c73 Mon Sep 17 00:00:00 2001
From: Oleksandr Redko <oleksandr.red+github@gmail.com>
Date: Mon, 4 Aug 2025 18:38:05 +0300
Subject: [PATCH] lint: fix usetesting issues

Signed-off-by: Oleksandr Redko <oleksandr.red+github@gmail.com>
---
 fileutils/path_test.go  | 56 +++++++++++++++--------------------------
 fileutils_iface_test.go |  8 +-----
 2 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/fileutils/path_test.go b/fileutils/path_test.go
index 5023e50..f3bd69e 100644
--- a/fileutils/path_test.go
+++ b/fileutils/path_test.go
@@ -25,55 +25,39 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func makeDirStructure(tgt string) (string, string, error) {
+func makeDirStructure(tb testing.TB, tgt string) (string, string) {
+	tb.Helper()
+
 	if tgt == "" {
 		tgt = "pkgpaths"
 	}
-	td, err := os.MkdirTemp("", tgt)
-	if err != nil {
-		return "", "", err
-	}
-	td2, err := os.MkdirTemp("", tgt+"-2")
-	if err != nil {
-		return "", "", err
-	}
+
+	td := tb.TempDir()
 	realPath := filepath.Join(td, "src", "foo", "bar")
-	if err := os.MkdirAll(realPath, os.ModePerm); err != nil {
-		return "", "", err
-	}
+	err := os.MkdirAll(realPath, os.ModePerm)
+	require.NoError(tb, err)
 	linkPathBase := filepath.Join(td, "src", "baz")
-	if err := os.MkdirAll(linkPathBase, os.ModePerm); err != nil {
-		return "", "", err
-	}
+	err = os.MkdirAll(linkPathBase, os.ModePerm)
+	require.NoError(tb, err)
 	linkPath := filepath.Join(linkPathBase, "das")
-	if err := os.Symlink(realPath, linkPath); err != nil {
-		return "", "", err
-	}
+	err = os.Symlink(realPath, linkPath)
+	require.NoError(tb, err)
 
+	td2 := tb.TempDir()
 	realPath = filepath.Join(td2, "src", "fuu", "bir")
-	if err := os.MkdirAll(realPath, os.ModePerm); err != nil {
-		return "", "", err
-	}
+	err = os.MkdirAll(realPath, os.ModePerm)
+	require.NoError(tb, err)
 	linkPathBase = filepath.Join(td2, "src", "biz")
-	if err := os.MkdirAll(linkPathBase, os.ModePerm); err != nil {
-		return "", "", err
-	}
+	err = os.MkdirAll(linkPathBase, os.ModePerm)
+	require.NoError(tb, err)
 	linkPath = filepath.Join(linkPathBase, "dis")
-	if err := os.Symlink(realPath, linkPath); err != nil {
-		return "", "", err
-	}
-	return td, td2, nil
+	err = os.Symlink(realPath, linkPath)
+	require.NoError(tb, err)
+	return td, td2
 }
 
 func TestFindPackage(t *testing.T) {
-	pth, pth2, err := makeDirStructure("")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		os.RemoveAll(pth)
-		os.RemoveAll(pth2)
-	}()
+	pth, pth2 := makeDirStructure(t, "")
 
 	searchPath := pth + string(filepath.ListSeparator) + pth2
 	// finds package when real name mentioned
diff --git a/fileutils_iface_test.go b/fileutils_iface_test.go
index 83ac0f8..0069269 100644
--- a/fileutils_iface_test.go
+++ b/fileutils_iface_test.go
@@ -26,13 +26,7 @@ import (
 func TestFileUtilsIface(t *testing.T) {
 	t.Run("deprecated functions should work", func(t *testing.T) {
 		t.Run("with test package path", func(t *testing.T) {
-			const tgt = "testpath"
-
-			td, err := os.MkdirTemp("", tgt) //nolint:usetesting // as t.TempDir in testing not yet fully working (on windows)
-			require.NoError(t, err)
-			t.Cleanup(func() {
-				_ = os.RemoveAll(td)
-			})
+			td := t.TempDir()
 
 			realPath := filepath.Join(td, "src", "foo", "bar")
 			require.NoError(t, os.MkdirAll(realPath, os.ModePerm))