@@ -357,14 +357,14 @@ func TestTunnelingWebsocketUpgraderConn_LocalRemoteAddress(t *testing.T) {
357
357
func TestTunnelingWebsocketUpgraderConn_SetDeadline (t * testing.T ) {
358
358
tc := & tunnelingWebsocketUpgraderConn {conn : & mockConn {}}
359
359
expected := time .Now ()
360
- assert .Nil (t , tc .SetDeadline (expected ), "SetDeadline does not return error" )
360
+ assert .NoError (t , tc .SetDeadline (expected ), "SetDeadline does not return error" )
361
361
assert .Equal (t , expected , tc .conn .(* mockConn ).readDeadline , "SetDeadline() sets read deadline" )
362
362
assert .Equal (t , expected , tc .conn .(* mockConn ).writeDeadline , "SetDeadline() sets write deadline" )
363
363
expected = time .Now ()
364
- assert .Nil (t , tc .SetWriteDeadline (expected ), "SetWriteDeadline does not return error" )
364
+ assert .NoError (t , tc .SetWriteDeadline (expected ), "SetWriteDeadline does not return error" )
365
365
assert .Equal (t , expected , tc .conn .(* mockConn ).writeDeadline , "Expected write deadline set" )
366
366
expected = time .Now ()
367
- assert .Nil (t , tc .SetReadDeadline (expected ), "SetReadDeadline does not return error" )
367
+ assert .NoError (t , tc .SetReadDeadline (expected ), "SetReadDeadline does not return error" )
368
368
assert .Equal (t , expected , tc .conn .(* mockConn ).readDeadline , "Expected read deadline set" )
369
369
expectedErr := fmt .Errorf ("deadline error" )
370
370
tc = & tunnelingWebsocketUpgraderConn {conn : & mockConn {deadlineErr : expectedErr }}
@@ -373,9 +373,9 @@ func TestTunnelingWebsocketUpgraderConn_SetDeadline(t *testing.T) {
373
373
assert .Equal (t , expectedErr , actualErr , "SetDeadline() expected error returned" )
374
374
// Connection nil, returns nil error.
375
375
tc .conn = nil
376
- assert .Nil (t , tc .SetDeadline (expected ), "SetDeadline() with nil connection always returns nil error" )
377
- assert .Nil (t , tc .SetWriteDeadline (expected ), "SetWriteDeadline() with nil connection always returns nil error" )
378
- assert .Nil (t , tc .SetReadDeadline (expected ), "SetReadDeadline() with nil connection always returns nil error" )
376
+ assert .NoError (t , tc .SetDeadline (expected ), "SetDeadline() with nil connection always returns nil error" )
377
+ assert .NoError (t , tc .SetWriteDeadline (expected ), "SetWriteDeadline() with nil connection always returns nil error" )
378
+ assert .NoError (t , tc .SetReadDeadline (expected ), "SetReadDeadline() with nil connection always returns nil error" )
379
379
}
380
380
381
381
var expectedContentLengthHeaders = http.Header {
0 commit comments