From 88149ed43e50325f3200b580be400c91ed01aaac Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 6 Sep 2022 17:48:26 -0700 Subject: [PATCH] os: fix wrong error msg from TestReadClosed If test would fail, the error message will have wrong error and its type, because e is used after the failed type assertion. To fix, use the original err. While at it, - combine the checks for error type and value into one statement; - use the standard "got ..., want ..." format. Fixes: 212d2f82e050 ("os: add ErrClosed, return for use of closed File") Change-Id: I862a96607b461ab89cce6bed2443b28aa2c16468 Reviewed-on: https://go-review.googlesource.com/c/go/+/428915 Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Tobias Klauser Reviewed-by: Michael Knyszek Auto-Submit: Ian Lance Taylor --- src/os/os_test.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/os/os_test.go b/src/os/os_test.go index 3f75f28938..45d3aa6b5e 100644 --- a/src/os/os_test.go +++ b/src/os/os_test.go @@ -314,12 +314,8 @@ func TestReadClosed(t *testing.T) { _, err = file.Read(b) e, ok := err.(*PathError) - if !ok { - t.Fatalf("Read: %T(%v), want PathError", e, e) - } - - if e.Err != ErrClosed { - t.Errorf("Read: %v, want PathError(ErrClosed)", e) + if !ok || e.Err != ErrClosed { + t.Fatalf("Read: got %T(%v), want %T(%v)", err, err, e, ErrClosed) } }