mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-05 13:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: test for timeout error using the net.Error interface

Browse source 
Don't do a substring search to test for a timeout error.

Fixes #14722 (maybe)

Change-Id: I4e18c749d6fd92c084a1b0b83a805119e1ae5ff2
Reviewed-on: https://go-review.googlesource.com/20403
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Brad Fitzpatrick 2016-03-08 22:10:28 +00:00
parent 02385a0059
commit b558e7afec
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
tls_test.go
View file

@ -188,11 +188,18 @@ func TestDialTimeout(t *testing.T) {
t.Fatal("DialWithTimeout completed successfully") t.Fatal("DialWithTimeout completed successfully")
} }
if !strings.Contains(err.Error(), "timed out") { if !isTimeoutError(err) {
t.Errorf("resulting error not a timeout: %s", err) t.Errorf("resulting error not a timeout: %v\nType %T: %#v", err, err, err)
} }
} }
func isTimeoutError(err error) bool {
if ne, ok := err.(net.Error); ok {
return ne.Timeout()
}
return false
}
// tests that Conn.Read returns (non-zero, io.EOF) instead of // tests that Conn.Read returns (non-zero, io.EOF) instead of
// (non-zero, nil) when a Close (alertCloseNotify) is sitting right // (non-zero, nil) when a Close (alertCloseNotify) is sitting right
// behind the application data in the buffer. // behind the application data in the buffer.