Skip to content

Commit e1bc7c5

Browse files
committed
pebble: fix TestOpenAlreadyLocked
Fix the relative path subtests. Fixes: #5053
1 parent 837c19b commit e1bc7c5

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

open_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,19 +472,20 @@ func TestOpenAlreadyLocked(t *testing.T) {
472472
t.Run("relative", func(t *testing.T) {
473473
original, err := os.Getwd()
474474
require.NoError(t, err)
475-
defer func() { require.NoError(t, os.Chdir(original)) }()
476475

477476
for _, tc := range testCases {
478477
t.Run(tc.name, func(t *testing.T) {
479478
// Create a temporary directory structure for relative paths.
480479
tempRoot := t.TempDir()
481-
wd := filepath.Dir(tempRoot)
482-
require.NoError(t, os.Chdir(wd))
480+
require.NoError(t, os.Chdir(tempRoot))
481+
defer func() { require.NoError(t, os.Chdir(original)) }()
483482

484483
var tmpDirs [4]string
485484
for i := range tmpDirs {
486485
tmpDirs[i] = filepath.Join(tempRoot, fmt.Sprintf("dir%d", i))
487-
require.NoError(t, os.MkdirAll(tmpDirs[i], 0755), "Failed to create temp dir %s", tmpDirs[i])
486+
require.NoError(t, os.Mkdir(tmpDirs[i], 0755), "Failed to create temp dir %s", tmpDirs[i])
487+
tmpDirs[i], err = filepath.Rel(tempRoot, tmpDirs[i])
488+
require.NoError(t, err)
488489
}
489490

490491
runTest(t, tmpDirs, tc.setupLocks, vfs.Default)

0 commit comments

Comments
 (0)