Skip to content

Commit f68b5ac

Browse files
committed
some text fix
1 parent b337cc4 commit f68b5ac

2 files changed

Lines changed: 9 additions & 4 deletions

File tree

internal/fspolicy/policy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (p FSPolicy) VerifyDirResolved(absDir string) error {
142142
if !p.blockSymlinks {
143143
st, err := os.Stat(d)
144144
if err != nil {
145-
return err
145+
return fmt.Errorf("stat dir error: %w", err)
146146
}
147147
if !st.IsDir() {
148148
return fmt.Errorf("not a directory: %s", d)

internal/fspolicy/policy_test.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,14 @@ func TestResolvePath_HappyAndErrors(t *testing.T) {
201201
if err != nil {
202202
t.Fatalf("ResolvePath(%q,%q) error: %v", c.in, c.def, err)
203203
}
204-
wantClean := filepath.Clean(pathAbs(t, c.want))
205-
if got != wantClean {
206-
t.Fatalf("ResolvePath(%q)=%q, want %q", c.in, got, wantClean)
204+
abs, err := filepath.Abs(c.want)
205+
if err != nil {
206+
t.Fatalf("Abs(%q): %v", c.want, err)
207+
}
208+
abs = applySystemRootAliases(abs)
209+
210+
if got != abs {
211+
t.Fatalf("ResolvePath(%q)=%q, want %q", c.in, got, abs)
207212
}
208213
})
209214
}

0 commit comments

Comments
 (0)