From 9bd21607900d7072fd3d12ec756cb5eb87f8fe2a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Olivier=20Mengu=C3=A9?= Date: Thu, 6 Mar 2025 16:25:51 +0100 Subject: [PATCH] os: add missing calls to Root.Close() in tests In tests of os.Root, fix a few missing calls to Close(). Change-Id: I8fddd5468394f41d7e92741579fd47f90203ff9f Reviewed-on: https://go-review.googlesource.com/c/go/+/655337 LUCI-TryBot-Result: Go LUCI Reviewed-by: Ian Lance Taylor Reviewed-by: Damien Neil Auto-Submit: Damien Neil --- src/os/os_test.go | 1 + src/os/root_test.go | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/os/os_test.go b/src/os/os_test.go index 81c9fddf5f..424c5286ea 100644 --- a/src/os/os_test.go +++ b/src/os/os_test.go @@ -3199,6 +3199,7 @@ func TestRootDirFS(t *testing.T) { if err != nil { t.Fatal(err) } + defer r.Close() testDirFS(t, r.FS()) } diff --git a/src/os/root_test.go b/src/os/root_test.go index a7ea0025ec..5560d435de 100644 --- a/src/os/root_test.go +++ b/src/os/root_test.go @@ -539,17 +539,19 @@ func TestRootOpenFileAsRoot(t *testing.T) { if err := os.WriteFile(target, nil, 0o666); err != nil { t.Fatal(err) } - _, err := os.OpenRoot(target) + r, err := os.OpenRoot(target) if err == nil { + r.Close() t.Fatal("os.OpenRoot(file) succeeded; want failure") } - r, err := os.OpenRoot(dir) + r, err = os.OpenRoot(dir) if err != nil { t.Fatal(err) } defer r.Close() - _, err = r.OpenRoot("target") + rr, err := r.OpenRoot("target") if err == nil { + rr.Close() t.Fatal("Root.OpenRoot(file) succeeded; want failure") } } -- 2.51.0