Use t.Chdir() instead of manual os.Chdir patterns in tests (#4660)

## Summary
- Replace manual working directory manipulation with `t.Chdir()`, added
in Go 1.24
- Remove `testutil.Chdir` and `testutil.TestData` which are now unused
- Add a gorule (`libs/gorules/rule_os_chdir.go`) that rejects `os.Chdir`
in `_test.go` files going forward

## Test plan
- [x] All affected package tests pass
- [x] `make lintfull` passes with 0 issues
- [x] Gorule correctly flags `os.Chdir` in test files

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

Author: pietern

acceptance/internal/cmd_server.go

@@ -44,7 +44,7 @@ func StartCmdServer(t *testing.T) *testserver.Server {
 }
 
 // chdir variant that is intended to be used with defer so that it can switch back before function ends.
-// This is unlike testutil.Chdir which switches back only when tests end.
+// This is unlike t.Chdir which switches back only when tests end.
 func chdir(t *testing.T, cwd string) func() {
 	require.NotEmpty(t, cwd)
 	prevDir, err := os.Getwd()

bundle/bundle_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/databricks/cli/bundle/config"
 	"github.com/databricks/cli/bundle/config/resources"
 	"github.com/databricks/cli/bundle/env"
-	"github.com/databricks/cli/internal/testutil"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/dyn"
 	"github.com/databricks/cli/libs/logdiag"
@@ -116,7 +115,7 @@ func TestBundleMustLoadFailureWithEnv(t *testing.T) {
 }
 
 func TestBundleMustLoadFailureIfNotFound(t *testing.T) {
-	testutil.Chdir(t, t.TempDir())
+	t.Chdir(t.TempDir())
 	b, diags := mustLoad(t)
 	require.Nil(t, b)
 	require.Len(t, diags, 1, "expected diagnostics")
@@ -142,7 +141,7 @@ func TestBundleTryLoadFailureWithEnv(t *testing.T) {
 }
 
 func TestBundleTryLoadOkIfNotFound(t *testing.T) {
-	testutil.Chdir(t, t.TempDir())
+	t.Chdir(t.TempDir())
 	b, diags := tryLoad(t)
 	assert.Nil(t, b)
 	assert.Empty(t, diags, "expected no diagnostics")

bundle/config/mutator/python/python_mutator_test.go

@@ -563,18 +563,11 @@ func loadYaml(name, content string) *bundle.Bundle {
 }
 
 func withFakeVEnv(t *testing.T, venvPath string) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-
-	if err := os.Chdir(t.TempDir()); err != nil {
-		panic(err)
-	}
+	t.Chdir(t.TempDir())
 
 	interpreterPath := interpreterPath(venvPath)
 
-	err = os.MkdirAll(filepath.Dir(interpreterPath), 0o755)
+	err := os.MkdirAll(filepath.Dir(interpreterPath), 0o755)
 	if err != nil {
 		panic(err)
 	}
@@ -588,12 +581,6 @@ func withFakeVEnv(t *testing.T, venvPath string) {
 	if err != nil {
 		panic(err)
 	}
-
-	t.Cleanup(func() {
-		if err := os.Chdir(cwd); err != nil {
-			panic(err)
-		}
-	})
 }
 
 func interpreterPath(venvPath string) string {

bundle/root_test.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/databricks/cli/bundle/config"
 	"github.com/databricks/cli/bundle/env"
-	"github.com/databricks/cli/internal/testutil"
 	"github.com/stretchr/testify/require"
 )
 
@@ -62,7 +61,15 @@ func TestRootLookup(t *testing.T) {
 	t.Setenv(env.RootVariable, "")
 	os.Unsetenv(env.RootVariable)
 
-	testutil.Chdir(t, t.TempDir())
+	t.Chdir(t.TempDir())
+
+	// Resolve to canonical path for comparison below. This is needed because
+	// os.Getwd may return a path with symlinks (macOS) or 8.3 short names
+	// (Windows) after a relative chdir.
+	root, err := os.Getwd()
+	require.NoError(t, err)
+	root, err = filepath.EvalSymlinks(root)
+	require.NoError(t, err)
 
 	// Create databricks.yml file.
 	f, err := os.Create(config.FileNames[0])
@@ -74,10 +81,12 @@ func TestRootLookup(t *testing.T) {
 	require.NoError(t, err)
 
 	// It should find the project root from $PWD.
-	wd := testutil.Chdir(t, "./a/b/c")
-	root, err := mustGetRoot(ctx)
+	t.Chdir("./a/b/c")
+	foundRoot, err := mustGetRoot(ctx)
+	require.NoError(t, err)
+	foundRoot, err = filepath.EvalSymlinks(foundRoot)
 	require.NoError(t, err)
-	require.Equal(t, wd, root)
+	require.Equal(t, root, foundRoot)
 }
 
 func TestRootLookupError(t *testing.T) {
@@ -88,7 +97,7 @@ func TestRootLookupError(t *testing.T) {
 	os.Unsetenv(env.RootVariable)
 
 	// It can't find a project root from a temporary directory.
-	_ = testutil.Chdir(t, t.TempDir())
+	t.Chdir(t.TempDir())
 	_, err := mustGetRoot(ctx)
 	require.ErrorContains(t, err, "unable to locate bundle root")
 }

cmd/apps/dev_test.go

@@ -63,15 +63,10 @@ func TestStartViteDevServerNoNode(t *testing.T) {
 
 	// Create a temporary directory to act as project root
 	tmpDir := t.TempDir()
-	oldWd, err := os.Getwd()
-	require.NoError(t, err)
-	defer func() { _ = os.Chdir(oldWd) }()
-
-	err = os.Chdir(tmpDir)
-	require.NoError(t, err)
+	t.Chdir(tmpDir)
 
 	// Create a client directory
-	err = os.Mkdir("client", 0o755)
+	err := os.Mkdir("client", 0o755)
 	require.NoError(t, err)
 
 	// Try to start Vite server with invalid app URL (will fail fast)

cmd/apps/import_test.go

@@ -103,14 +103,7 @@ env: []`,
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			// Create temp directory and change to it
-			tmpDir := t.TempDir()
-			originalDir, err := os.Getwd()
-			require.NoError(t, err)
-			defer func() {
-				_ = os.Chdir(originalDir)
-			}()
-			err = os.Chdir(tmpDir)
-			require.NoError(t, err)
+			t.Chdir(t.TempDir())
 
 			// Setup files
 			for filename, content := range tt.setupFiles {
@@ -159,17 +152,10 @@ env: []`,
 
 func TestInlineAppConfigFileErrors(t *testing.T) {
 	t.Run("invalid yaml", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		originalDir, err := os.Getwd()
-		require.NoError(t, err)
-		defer func() {
-			_ = os.Chdir(originalDir)
-		}()
-		err = os.Chdir(tmpDir)
-		require.NoError(t, err)
+		t.Chdir(t.TempDir())
 
 		// Create invalid YAML
-		err = os.WriteFile("app.yml", []byte("invalid: yaml: content:\n  - broken"), 0o644)
+		err := os.WriteFile("app.yml", []byte("invalid: yaml: content:\n  - broken"), 0o644)
 		require.NoError(t, err)
 
 		appValue := dyn.V(map[string]dyn.Value{"name": dyn.V("test")})
@@ -179,16 +165,9 @@ func TestInlineAppConfigFileErrors(t *testing.T) {
 	})
 
 	t.Run("app value not a map", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		originalDir, err := os.Getwd()
-		require.NoError(t, err)
-		defer func() {
-			_ = os.Chdir(originalDir)
-		}()
-		err = os.Chdir(tmpDir)
-		require.NoError(t, err)
+		t.Chdir(t.TempDir())
 
-		err = os.WriteFile("app.yml", []byte("command: [\"test\"]"), 0o644)
+		err := os.WriteFile("app.yml", []byte("command: [\"test\"]"), 0o644)
 		require.NoError(t, err)
 
 		appValue := dyn.V("not a map")
@@ -198,18 +177,11 @@ func TestInlineAppConfigFileErrors(t *testing.T) {
 	})
 
 	t.Run("unreadable app.yml", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		originalDir, err := os.Getwd()
-		require.NoError(t, err)
-		defer func() {
-			_ = os.Chdir(originalDir)
-		}()
-		err = os.Chdir(tmpDir)
-		require.NoError(t, err)
+		t.Chdir(t.TempDir())
 
 		// Create file with no read permissions
 		filename := "app.yml"
-		err = os.WriteFile(filename, []byte("command: [\"test\"]"), 0o644)
+		err := os.WriteFile(filename, []byte("command: [\"test\"]"), 0o644)
 		require.NoError(t, err)
 
 		if runtime.GOOS == "windows" {
@@ -239,16 +211,9 @@ func TestInlineAppConfigFileErrors(t *testing.T) {
 
 func TestInlineAppConfigFileFieldPriority(t *testing.T) {
 	t.Run("all fields present", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		originalDir, err := os.Getwd()
-		require.NoError(t, err)
-		defer func() {
-			_ = os.Chdir(originalDir)
-		}()
-		err = os.Chdir(tmpDir)
-		require.NoError(t, err)
+		t.Chdir(t.TempDir())
 
-		err = os.WriteFile("app.yml", []byte(`command: ["python", "app.py"]
+		err := os.WriteFile("app.yml", []byte(`command: ["python", "app.py"]
 env:
   - name: FOO
     value: bar

cmd/labs/project/installer_test.go

@@ -355,15 +355,8 @@ func TestInstallerWorksForDevelopment(t *testing.T) {
 	}))
 	defer server.Close()
 
-	wd, _ := os.Getwd()
-	defer func() {
-		err := os.Chdir(wd)
-		require.NoError(t, err)
-	}()
-
 	devDir := copyTestdata(t, "testdata/installed-in-home/.databricks/labs/blueprint/lib")
-	err := os.Chdir(devDir)
-	require.NoError(t, err)
+	t.Chdir(devDir)
 
 	ctx := installerContext(t, server)
 	py, _ := python.DetectExecutable(ctx)
@@ -379,7 +372,7 @@ func TestInstallerWorksForDevelopment(t *testing.T) {
 	ctx = env.Set(ctx, "DATABRICKS_WAREHOUSE_ID", "efg-id")
 
 	home, _ := env.UserHomeDir(ctx)
-	err = os.WriteFile(filepath.Join(home, ".databrickscfg"), []byte(fmt.Sprintf(`
+	err := os.WriteFile(filepath.Join(home, ".databrickscfg"), []byte(fmt.Sprintf(`
 [profile-one]
 host = %s
 token = ...

cmd/root/bundle_test.go

@@ -47,7 +47,7 @@ func setupWithHost(t *testing.T, cmd *cobra.Command, host string) []diag.Diagnos
 	setupDatabricksCfg(t)
 
 	rootPath := t.TempDir()
-	testutil.Chdir(t, rootPath)
+	t.Chdir(rootPath)
 
 	contents := fmt.Sprintf(`
 workspace:
@@ -67,7 +67,7 @@ func setupWithProfile(t *testing.T, cmd *cobra.Command, profile string) []diag.D
 	setupDatabricksCfg(t)
 
 	rootPath := t.TempDir()
-	testutil.Chdir(t, rootPath)
+	t.Chdir(rootPath)
 
 	contents := fmt.Sprintf(`
 workspace:
@@ -228,7 +228,7 @@ func TestBundleConfigureMultiMatchInteractivePromptFires(t *testing.T) {
 	setupDatabricksCfg(t)
 
 	rootPath := t.TempDir()
-	testutil.Chdir(t, rootPath)
+	t.Chdir(rootPath)
 
 	contents := `
 workspace:

internal/testutil/env.go

@@ -2,11 +2,8 @@ package testutil
 
 import (
 	"os"
-	"path/filepath"
 	"runtime"
 	"strings"
-
-	"github.com/stretchr/testify/require"
 )
 
 // CleanupEnvironment sets up a pristine environment containing only $PATH and $HOME.
@@ -46,37 +43,3 @@ func NullEnvironment(t TestingT) {
 
 	os.Clearenv()
 }
-
-// Changes into specified directory for the duration of the test.
-// Returns the current working directory.
-func Chdir(t TestingT, dir string) string {
-	// Prevent parallel execution when changing the working directory.
-	// t.Setenv automatically fails if t.Parallel is set.
-	t.Setenv("DO_NOT_RUN_IN_PARALLEL", "true")
-
-	wd, err := os.Getwd()
-	require.NoError(t, err)
-	if os.Getenv("TESTS_ORIG_WD") == "" {
-		t.Setenv("TESTS_ORIG_WD", wd)
-	}
-
-	abs, err := filepath.Abs(dir)
-	require.NoError(t, err)
-
-	err = os.Chdir(abs)
-	require.NoError(t, err)
-
-	t.Cleanup(func() {
-		err := os.Chdir(wd)
-		require.NoError(t, err)
-	})
-
-	return wd
-}
-
-// Return filename ff testutil.Chdir was not called.
-// Return absolute path to filename testutil.Chdir() was called.
-func TestData(filename string) string {
-	// Note, if TESTS_ORIG_WD is not set, Getenv return "" and Join returns filename
-	return filepath.Join(os.Getenv("TESTS_ORIG_WD"), filename)
-}

libs/apps/vite/bridge_test.go

@@ -19,17 +19,11 @@ import (
 func TestValidateFilePath(t *testing.T) {
 	// Create a temporary directory structure for testing
 	tmpDir := t.TempDir()
-	oldWd, err := os.Getwd()
-	require.NoError(t, err)
-	defer func() { _ = os.Chdir(oldWd) }()
-
-	// Change to temp directory
-	err = os.Chdir(tmpDir)
-	require.NoError(t, err)
+	t.Chdir(tmpDir)
 
 	// Create the allowed directory
 	queriesDir := filepath.Join(tmpDir, "config", "queries")
-	err = os.MkdirAll(queriesDir, 0o755)
+	err := os.MkdirAll(queriesDir, 0o755)
 	require.NoError(t, err)
 
 	// Create a valid test file
@@ -201,15 +195,10 @@ func TestBridgeHandleMessage(t *testing.T) {
 func TestBridgeHandleFileReadRequest(t *testing.T) {
 	// Create a temporary directory structure
 	tmpDir := t.TempDir()
-	oldWd, err := os.Getwd()
-	require.NoError(t, err)
-	defer func() { _ = os.Chdir(oldWd) }()
-
-	err = os.Chdir(tmpDir)
-	require.NoError(t, err)
+	t.Chdir(tmpDir)
 
 	queriesDir := filepath.Join(tmpDir, "config", "queries")
-	err = os.MkdirAll(queriesDir, 0o755)
+	err := os.MkdirAll(queriesDir, 0o755)
 	require.NoError(t, err)
 
 	testContent := "SELECT * FROM users WHERE id = 1"