TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-21 14:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/nettest: remove pointless checks in tests

Browse Source 
If err == nil, then !errors.Is(err, anything).
This commit is contained in:
Josh Bleecher Snyder 2021-01-15 17:57:39 -08:00 committed by Josh Bleecher Snyder
parent 503db5540f
commit a64d06f15c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/nettest/pipe_test.go
View File

@ -35,7 +35,7 @@ func TestPipeTimeout(t *testing.T) {
p := NewPipe("p1", 1<<16) p := NewPipe("p1", 1<<16)
p.SetWriteDeadline(time.Now().Add(-1 * time.Second)) p.SetWriteDeadline(time.Now().Add(-1 * time.Second))
n, err := p.Write([]byte{'h'}) n, err := p.Write([]byte{'h'})
if err == nil || !errors.Is(err, ErrWriteTimeout) || !errors.Is(err, ErrTimeout) { if !errors.Is(err, ErrWriteTimeout) || !errors.Is(err, ErrTimeout) {
t.Errorf("missing write timeout got err: %v", err) t.Errorf("missing write timeout got err: %v", err)
} }
if n != 0 { if n != 0 {
@ -49,7 +49,7 @@ func TestPipeTimeout(t *testing.T) {
p.SetReadDeadline(time.Now().Add(-1 * time.Second)) p.SetReadDeadline(time.Now().Add(-1 * time.Second))
b := make([]byte, 1) b := make([]byte, 1)
n, err := p.Read(b) n, err := p.Read(b)
if err == nil || !errors.Is(err, ErrReadTimeout) || !errors.Is(err, ErrTimeout) { if !errors.Is(err, ErrReadTimeout) || !errors.Is(err, ErrTimeout) {
t.Errorf("missing read timeout got err: %v", err) t.Errorf("missing read timeout got err: %v", err)
} }
if n != 0 { if n != 0 {
@ -65,7 +65,7 @@ func TestPipeTimeout(t *testing.T) {
if err := p.Block(); err != nil { if err := p.Block(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if _, err := p.Write([]byte{'h'}); err == nil || !errors.Is(err, ErrWriteTimeout) { if _, err := p.Write([]byte{'h'}); !errors.Is(err, ErrWriteTimeout) {
t.Fatalf("want write timeout got: %v", err) t.Fatalf("want write timeout got: %v", err)
} }
}) })
@ -80,11 +80,10 @@ func TestPipeTimeout(t *testing.T) {
if err := p.Block(); err != nil { if err := p.Block(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
if _, err := p.Read(b); err == nil || !errors.Is(err, ErrReadTimeout) { if _, err := p.Read(b); !errors.Is(err, ErrReadTimeout) {
t.Fatalf("want read timeout got: %v", err) t.Fatalf("want read timeout got: %v", err)
} }
}) })
} }
func TestLimit(t *testing.T) { func TestLimit(t *testing.T) {