os: skip size test in TestLstat if the file is a symlink

ianlancetaylor · gopherbot · commit 9b8750f53ed8 · 2022-12-10T00:35:24.000Z
Tested by temporarily changing sysdir to use a directory where the expected files were all symlinks. We should consider using a different approach that doesn't rely on sysdir, but for now do a minimal fix. Fixes #57210 Change-Id: Ifb1becef03e014ceb48290ce13527b3e103c0e07 Reviewed-on: https://go-review.googlesource.com/c/go/+/456557 Reviewed-by: Ian Lance Taylor <iant@google.com> Reviewed-by: Bryan Mills <bcmills@google.com> Run-TryBot: Ian Lance Taylor <iant@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gopher Robot <gobot@golang.org>
diff --git a/src/os/os_test.go b/src/os/os_test.go
@@ -274,9 +274,11 @@ func TestLstat(t *testing.T) {
 	if !equal(sfname, dir.Name()) {
 		t.Error("name should be ", sfname, "; is", dir.Name())
 	}
-	filesize := size(path, t)
-	if dir.Size() != filesize {
-		t.Error("size should be", filesize, "; is", dir.Size())
+	if dir.Mode()&ModeSymlink == 0 {
+		filesize := size(path, t)
+		if dir.Size() != filesize {
+			t.Error("size should be", filesize, "; is", dir.Size())
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -274,9 +274,11 @@ func TestLstat(t *testing.T) {`
`274`	`274`	`if !equal(sfname, dir.Name()) {`
`275`	`275`	`t.Error("name should be ", sfname, "; is", dir.Name())`
`276`	`276`	`}`
`277`		`- filesize := size(path, t)`
`278`		`- if dir.Size() != filesize {`
`279`		`- t.Error("size should be", filesize, "; is", dir.Size())`
	`277`	`+ if dir.Mode()&ModeSymlink == 0 {`
	`278`	`+ filesize := size(path, t)`
	`279`	`+ if dir.Size() != filesize {`
	`280`	`+ t.Error("size should be", filesize, "; is", dir.Size())`
	`281`	`+ }`
`280`	`282`	`}`
`281`	`283`	`}`
`282`	`284`