From e1968256d828d5f86f7ee09eaea945332df127b1 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 17 Aug 2020 15:53:04 +0000
Subject: Try to make io-50.6 more robust on the Travis macOS VM

---
 tests/io.test | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tests/io.test b/tests/io.test
index 685394c..016c6bd 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -6871,7 +6871,7 @@ test io-50.5 {testing handler deletion vs reentrant calls} -constraints {testcha
 } -cleanup {
     close $f
 } -result [list {del calling recursive} {del deleted notcalled} \
-	{del deleted myself} {del after recursive}]
+	       {del deleted myself} {del after recursive}]
 test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testchannelevent testservicemode} -setup {
     file delete $path(test1)
 } -body {
@@ -6880,6 +6880,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
     proc first {f} {
 	variable u
 	variable z
+	variable done
 	if {"$u" == "toplevel"} {
 	    lappend z "first called"
 	    set u first
@@ -6887,6 +6888,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
 	    vwait z
 	    after cancel $timer
 	    lappend z "first after toplevel"
+	    set done 1
 	} else {
 	    lappend z "first called not toplevel"
 	}
@@ -6908,19 +6910,24 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
     }
     set z ""
     set u toplevel
+    set done 0
     testservicemode 0
     set f [open $path(test1) r]
     testchannelevent $f add readable [namespace code [list second $f]]
     testchannelevent $f add readable [namespace code [list first $f]]
     testservicemode 1
     update
+    if {!$done} {
+	set $timer2 [after 200 lappend done timeout]
+	vwait done
+	after cancel timer2
+    }
     set z
 } -cleanup {
     close $f
 } -result [list {first called} {first called not toplevel} \
 	{second called, first time} {second called, second time} \
 	{first after toplevel}]
-
 test io-51.1 {Test old socket deletion on Macintosh} {socket} {
     set x 0
     set result ""
-- 
cgit v0.12


From 270c9b99d653dad45f98e06a5c503a6338479ac9 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 17 Aug 2020 16:21:05 +0000
Subject: Add the missing $.

---
 tests/io.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/io.test b/tests/io.test
index 016c6bd..6e2c907 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -6920,7 +6920,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
     if {!$done} {
 	set $timer2 [after 200 lappend done timeout]
 	vwait done
-	after cancel timer2
+	after cancel $timer2
     }
     set z
 } -cleanup {
-- 
cgit v0.12


From 6560454489df369db2c1edeaaf82a094efda0115 Mon Sep 17 00:00:00 2001
From: culler <culler>
Date: Mon, 17 Aug 2020 16:28:28 +0000
Subject: And remove the other $ and do the test slightly differently. 
 Inability to test locally is a challenge.

---
 tests/io.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/io.test b/tests/io.test
index 6e2c907..18636c1 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -6918,7 +6918,7 @@ test io-50.6 {testing handler deletion vs reentrant calls} -constraints {testcha
     testservicemode 1
     update
     if {!$done} {
-	set $timer2 [after 200 lappend done timeout]
+	set timer2 [after 200 set done 1]
 	vwait done
 	after cancel $timer2
     }
-- 
cgit v0.12