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 <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Damien Neil <dneil@google.com>

diff --git a/src/os/os_test.go b/src/os/os_test.go
index 81c9fddf5f5e606664a0ae0dc75bdc9c32c1490b..424c5286eabf02d329478f72c1174441cf3e2b82 100644 (file)
--- 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 a7ea0025ecc8106e97155426a131d5929d660055..5560d435debf31f1198d47981a7fafa94080b207 100644 (file)
--- 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")
        }
 }