Moved tests socket-8.2 and socket-8.3 to socket-14.3 and socket-14.4 and made them robust against connect failures

1 files changed, 31 insertions, 29 deletions

diff --git a/tests/socket.test b/tests/socket.test
index a3d4b4b..1b7c5fa 100644
--- a/tests/socket.test
+++ b/tests/socket.test
@@ -914,35 +914,6 @@ test socket-8.1 {testing -async flag on sockets} {socket} {
     set z
 } bye
 
-test socket-8.2 {testing writable event when quick failure} {socket win} {
-    # Test for bug 336441ed59 where a quick background fail was ignored
-
-    # Test only for windows as socket -async 255.255.255.255 fails directly
-    # on unix
-    
-    # The following connect should fail very quickly
-    set a1 [after 2000 {set x timeout}]
-    set s [socket -async 255.255.255.255 43434]
-    fileevent $s writable {set x writable}
-    vwait x
-    catch {close $s}
-    after cancel $a1
-    set x
-} writable
-
-test socket-8.3 {testing fileevent readable on failed async socket connect} {socket} {
-    # Test for bug 581937ab1e
-
-    set a1 [after 5000 {set x timeout}]
-    # This connect should fail
-    set s [socket -async localhost [randport]]
-    fileevent $s readable {set x readable}
-    vwait x
-    catch {close $s}
-    after cancel $a1
-    set x
-} readable
-
 test socket-9.1 {testing spurious events} {socket} {
     set len 0
     set spurious 0
@@ -1716,6 +1687,37 @@ if {[string match sock* $commandSocket] == 1} {
 }
 catch {close $commandSocket}
 catch {close $remoteProcChan}
+test socket-14.13 {testing writable event when quick failure} -constraints {socket win supported_inet} -body {
+    # Test for bug 336441ed59 where a quick background fail was ignored
+    
+    # Test only for windows as socket -async 255.255.255.255 fails
+    # directly on unix
+    
+    # The following connect should fail very quickly
+    set a1 [after 2000 {set x timeout}]
+    set s [socket -async 255.255.255.255 43434]
+    fileevent $s writable {set x writable}
+    vwait x
+    set x
+} -cleanup {
+    catch {close $s}
+    after cancel $a1
+} -result writable
+
+test socket-14.14 {testing fileevent readable on failed async socket connect} -constraints [list socket] -body {
+    # Test for bug 581937ab1e
+    
+    set a1 [after 5000 {set x timeout}]
+    # This connect should fail
+    set s [socket -async localhost [randport]]
+    fileevent $s readable {set x readable}
+    vwait x
+    set x
+} -cleanup {
+    catch {close $s}
+    after cancel $a1
+} -result readable
+
 ::tcltest::cleanupTests
 flush stdout
 return