net: retighten test harnesses for dial cancelation

Updates #11225.

Change-Id: I6c33d577f144643781f370ba2ab0997d1c1a3820
Reviewed-on: https://go-review.googlesource.com/17880
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Mikio Hara 2015-12-16 09:35:23 +09:00
parent 3cc24aa9ab
commit 1dc2e7b165
2 changed files with 6 additions and 3 deletions

View file

@ -93,7 +93,7 @@ second:
goto third
}
switch nestedErr {
case errClosing, errMissingAddress:
case errCanceled, errClosing, errMissingAddress:
return nil
}
return fmt.Errorf("unexpected type on 2nd nested level: %T", nestedErr)
@ -413,7 +413,7 @@ second:
goto third
}
switch nestedErr {
case errClosing, errTimeout, ErrWriteToConnected, io.ErrUnexpectedEOF:
case errCanceled, errClosing, errTimeout, ErrWriteToConnected, io.ErrUnexpectedEOF:
return nil
}
return fmt.Errorf("unexpected type on 2nd nested level: %T", nestedErr)