From e354a3523b26b111a2c4763191dcc2d1b6370d56 Mon Sep 17 00:00:00 2001
From: Dan Kegel <dkegel@fastly.com>
Date: Fri, 26 Nov 2021 18:53:33 -0800
Subject: [PATCH] os.Remove: avoid double-wrapping err; fixes TODO in test

---
 src/os/file.go         | 2 +-
 src/os/os_unix_test.go | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/os/file.go b/src/os/file.go
index 20e56fac3..b52d8c54c 100644
--- a/src/os/file.go
+++ b/src/os/file.go
@@ -47,7 +47,7 @@ func Remove(path string) error {
 	}
 	err := fs.Remove(suffix)
 	if err != nil {
-		return &PathError{"remove", path, err}
+		return err
 	}
 	return nil
 }
diff --git a/src/os/os_unix_test.go b/src/os/os_unix_test.go
index 8cb490c71..c1e53da2c 100644
--- a/src/os/os_unix_test.go
+++ b/src/os/os_unix_test.go
@@ -63,9 +63,8 @@ func TestRemove(t *testing.T) {
 				t.Errorf("TestRemove: PathError returned path %q, expected %q", pe.Path, f)
 			}
 		}
-		// TODO: make this pass.
 		if !IsNotExist(err) {
-			t.Logf("TestRemove: TODO: expected IsNotExist(err) true, got false; err %q", err.Error())
+			t.Errorf("TestRemove: expected IsNotExist(err) true, got false; err %q", err.Error())
 		}
 	}