diff options
| author | max <max@tclers.tk> | 2014-04-04 10:02:47 (GMT) |
|---|---|---|
| committer | max <max@tclers.tk> | 2014-04-04 10:02:47 (GMT) |
| commit | 053685ad2952fe7a83cf63ff28ec273862c903b3 (patch) | |
| tree | e28f08521e12f9fde833f2d4762ff83db2b77f9b /tests | |
| parent | 8978760b1a95d061dff0d9c3f0c8a997aa56998d (diff) | |
| download | tcl-053685ad2952fe7a83cf63ff28ec273862c903b3.zip tcl-053685ad2952fe7a83cf63ff28ec273862c903b3.tar.gz tcl-053685ad2952fe7a83cf63ff28ec273862c903b3.tar.bz2 | |
* Rework WaitForConnect() to fix synchronous completion of asynchronous connections.
* Let TcpInputProc() and TcpOutputProc() fail before calling any I/O syscalls when an asynchronous connection has failed.
* Adjust the tests accordingly.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/socket.test | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/socket.test b/tests/socket.test index 61660cd..4fba2c3 100644 --- a/tests/socket.test +++ b/tests/socket.test @@ -1993,7 +1993,7 @@ test socket-14.7.2 {pending [socket -async] and blocking [gets], no listener} \ list $x [fconfigure $sock -error] } -cleanup { close $sock - } -match glob -result {{error reading "sock*": socket is not connected} {connection refused}} + } -match glob -result {{error reading "sock*": connection refused} {}} test socket-14.8.0 {pending [socket -async] and nonblocking [gets], server is IPv4} \ -constraints {socket supported_inet supported_inet6} \ -setup { @@ -2055,10 +2055,10 @@ test socket-14.8.2 {pending [socket -async] and nonblocking [gets], no listener} if {[catch {gets $sock} x] || $x ne "" || ![fblocked $sock]} break after 200 } - fconfigure $sock -error + list $x [fconfigure $sock -error] } -cleanup { close $sock - } -match glob -result {connection refused} + } -match glob -result {{error reading "sock*": connection refused} {}} test socket-14.9.0 {pending [socket -async] and blocking [puts], server is IPv4} \ -constraints {socket supported_inet supported_inet6} \ -setup { @@ -2171,7 +2171,9 @@ test socket-14.11.0 {pending [socket -async] and blocking [puts], no listener, n vwait x close $sock } -cleanup { - } -result {broken pipe} -returnCodes 1 + catch {close $sock} + unset x + } -result {connection refused} -returnCodes 1 test socket-14.11.1 {pending [socket -async] and blocking [puts], no listener, flush} \ -constraints {socket supported_inet supported_inet6} \ -body { @@ -2183,8 +2185,9 @@ test socket-14.11.1 {pending [socket -async] and blocking [puts], no listener, f vwait x close $sock } -cleanup { + catch {close $sock} unset x - } -result {broken pipe} -returnCodes 1 + } -result {connection refused} -returnCodes 1 test socket-14.12 {[socket -async] background progress triggered by [fconfigure -error]} \ -constraints {socket supported_inet supported_inet6} \ -body { |