@@ -8,11 +8,11 @@
 # Copyright (c) 1998-2000 Ajuba Solutions. 
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tlsIO.test,v 1.14.2.2 2000/07/12 01:54:03 hobbs Exp $
+# RCS: @(#) $Id: tlsIO.test,v 1.14.2.3 2000/07/14 04:10:23 hobbs Exp $
 
 # Running socket tests with a remote server:
 # ------------------------------------------
 # 
 # Some tests in socket.test depend on the existence of a remote server to
@@ -576,11 +576,11 @@
     (procedure "tls::socket" line 62)
     invoked from within
 "tls::socket -server accept 8828"
     (file "script" line 1)}}
 
-test tlsIO-2.10 {close on accept, accepted socket lives} {socket knownBug} {
+test tlsIO-2.10 {close on accept, accepted socket lives} {socket} {
     set done 0
     set timer [after 20000 "set done timed_out"]
     set ss [tls::socket -server accept -certfile $serverCert -cafile $caCert \
 	-keyfile $serverKey 8830]
     proc accept {s a p} {
@@ -603,10 +603,11 @@
     after cancel $timer
     set done
 } 1
 
 test tlsIO-2.11 {detecting new data} {socket knownBug} {
+    # HOBBS: hung pre-rewrite, hangs post-rewrite
     proc accept {s a p} {
 	global sock
 	set sock $s
 	set f [open awb.log w]
 	puts $f [catch {tls::handshake $sock} err]
@@ -866,10 +867,11 @@
     }
     set x
 } {couldn't open socket: not owner}
 
 test tlsIO-6.1 {accept callback error} {unexplainedFailure socket stdio pcCrash} {
+    # HOBBS: still fails post-rewrite
     removeFile script
     set f [open script w]
     puts $f {
     	package require tls
 	gets stdin
@@ -893,11 +895,11 @@
     set x
 } {{divide by zero}}
 
 # bug report #5812 fconfigure doesn't return value for '-peername'
 
-test tlsIO-7.1 {testing socket specific options} {knownBug socket stdio} {
+test tlsIO-7.1 {testing socket specific options} {socket stdio} {
     removeFile script
     set f [open script w]
     puts $f {
 	package require tls
     }
@@ -927,11 +929,11 @@
     lappend l [llength $p]
 } {0 0 3}
 
 # bug report #5812 fconfigure doesn't return value for '-sockname'
 
-test tlsIO-7.2 {testing socket specific options} {knownBug socket stdio} {
+test tlsIO-7.2 {testing socket specific options} {socket stdio} {
     removeFile script
     set f [open script w]
     puts $f {
 	package require tls
     }
@@ -971,11 +973,11 @@
     llength $l
 } 12
 
 # bug report #5812 fconfigure doesn't return value for '-sockname'
 
-test tlsIO-7.4 {testing socket specific options} {knownBug socket} {
+test tlsIO-7.4 {testing socket specific options} {socket} {
     set s [tls::socket \
 	-certfile $serverCert -cafile $caCert -keyfile $serverKey \
     	-server accept 8823]
     proc accept {s a p} {
 	global x
@@ -994,11 +996,11 @@
     lappend l [lindex $x 2] [llength $x]
 } {8823 3}
 
 # bug report #5812 fconfigure doesn't return value for '-sockname'
 
-test tlsIO-7.5 {testing socket specific options} {knownBug socket unixOrPc} {
+test tlsIO-7.5 {testing socket specific options} {socket unixOrPc} {
     set s [tls::socket \
 	-certfile $serverCert -cafile $caCert -keyfile $serverKey \
     	-server accept 8829]
     proc accept {s a p} {
 	global x
@@ -1016,10 +1018,11 @@
     set l ""
     lappend l [lindex $x 0] [lindex $x 2] [llength $x]
 } {127.0.0.1 8829 3}
 
 test tlsIO-8.1 {testing -async flag on sockets} {unexplainedHang socket} {
+    # HOBBS: still fails post-rewrite
     # test seems to hang -- awb 6/2/2000
     # NOTE: This test may fail on some Solaris 2.4 systems. If it does,
     # check that you have these patches installed (using showrev -p):
     #
     # 101907-05, 101925-02, 101945-14, 101959-03, 101969-05, 101973-03,
@@ -1051,10 +1054,11 @@
     close $s1
     set z
 } bye
 
 test tlsIO-9.1 {testing spurious events} {unexplainedHang socket} {
+    # HOBBS: still fails post-rewrite
     # locks up 
     set len 0
     set spurious 0
     set done 0
     proc readlittle {s} {
@@ -1089,10 +1093,12 @@
     close $s
     list $spurious $len
 } {0 50}
 
 test tlsIO-9.2 {testing async write, fileevents, flush on close} {socket} {
+    # HOBBS: This hangs when I turn blocking on.
+    #
     set firstblock ""
     for {set i 0} {$i < 5} {incr i} {set firstblock "a$firstblock$firstblock"}
     set secondblock ""
     for {set i 0} {$i < 16} {incr i} {
 	set secondblock "b$secondblock$secondblock"
@@ -1134,18 +1140,20 @@
 	    close $s
 	    set done 1
 	}
     }
     fileevent $s readable "readit $s"
+    set done 0
     set timer [after 10000 "set done timed_out"]
     vwait done
     after cancel $timer
     close $l
-    set count
-} 65566
+    list $count $done
+} {65566 1}
 
 test tlsIO-9.3 {testing EOF stickyness} {unexplainedHang socket} {
+    # HOBBS: still fails post-rewrite
     # hangs
     proc count_to_eof {s} {
 	global count done timer
 	set l [gets $s]
 	if {[eof $s]} {