merge trunktip_401

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 672490a..6694ad6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2012-14-28  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
+2012-04-30  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
+
+	* tests/ioCmd.test: Tame deadlocks in broken refchan tests [Bug 3522560]
+
+2012-04-28  Alexandre Ferrieux  <ferrieux@users.sourceforge.net>
 
 	IMPLEMENTATION OF TIP#398
 
diff --git a/tests/ioCmd.test b/tests/ioCmd.test
index 4c08229..6b1da73 100644
--- a/tests/ioCmd.test
+++ b/tests/ioCmd.test
@@ -2575,6 +2575,7 @@ test iocmd.tf-24.15 {chan write, EAGAIN means that writing is not allowed at thi
     set res
 } -cleanup {
     proc foo {args} {onfinal; set ::done-24.15 1; return 3}
+    after 1000 {set ::done-24.15 2}
     vwait done-24.15
     rename foo {}
     unset res
@@ -2603,10 +2604,12 @@ test iocmd.tf-24.16 {chan write, note the background flush setup by close due to
     proc foo {args} { onfinal; note BG ; track ; set ::endbody-24.16 1}
     # Flush (sic!) the event-queue to capture the write from a
     # BG-flush.
+    after 1000 {set ::endbody-24.16 2}
     vwait endbody-24.16
     set res
 } -cleanup {
     proc foo {args} {onfinal; set ::done-24.16 1; return 3}
+    after 1000 {set ::done-24.16 2}
     vwait done-24.16
     rename foo {}
     unset res