From 6e977b903ee0e35f5b799abe1c8b3c902a5b5cef Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 17 May 2012 17:20:49 +0000
Subject: Cancel the timeout timers!  If this isn't done, lingering timers from
 early tests can trigger false timeouts of later tests (since they are all
 using a common variable name).

---
 tests/zlib.test | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/zlib.test b/tests/zlib.test
index 3aaca29..d8d710a 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -147,6 +147,7 @@ test zlib-8.3 {zlib transformation and fileevent} -constraints zlib -setup {
 	    set ::total [expr {$e eq {} ? $c : $e}]
 	}}}
 	vwait total
+	after cancel {set total timeout}
     } finally {
 	close $sin
     }
@@ -226,6 +227,7 @@ test zlib-9.3 "socket fcopy bg (identity)" -constraints {tempNotWin zlib} -setup
         set ::total [expr {$e eq {} ? $c : $e}]
     }}}
     vwait ::total
+    after cancel {set ::total timeout}
     close $sin; close $fout
     list read $::total size [file size $file]
 } -cleanup {
@@ -251,6 +253,7 @@ test zlib-9.4 "socket fcopy bg (gzip)" -constraints zlib -setup {
         set ::total [expr {$e eq {} ? $c : $e}]
     }}}
     vwait ::total
+    after cancel {set ::total timeout}
     close $sin; close $fout
     list read $::total size [file size $file]
 } -cleanup {
@@ -284,6 +287,7 @@ test zlib-9.5 "socket fcopy incremental (gzip)" -constraints zlib -setup {
     after 1000 {set ::total timeout}
     fcopy $sin $fout -size 8192 -command [list zlib95copy $sin $fout 0]
     vwait ::total
+    after cancel {set ::total timeout}
     close $sin; close $fout
     list $::total size [file size $file]
 } -cleanup {
@@ -312,6 +316,7 @@ test zlib-9.6 "bug #2818131 (gzip)" -constraints zlib -setup {
         }
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
     close $s
     set ::total
 } -cleanup {
@@ -339,6 +344,7 @@ test zlib-9.7 "bug #2818131 (compress)" -constraints zlib -setup {
         }
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
     close $s
     set ::total
 } -cleanup {
@@ -366,6 +372,7 @@ test zlib-9.8 "bug #2818131 (deflate)" -constraints zlib -setup {
         }
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
     close $s
     set ::total
 } -cleanup {
@@ -396,6 +403,7 @@ test zlib-9.9 "bug #2818131 (gzip mismatch)" -constraints zlib -setup {
         }} $s]
         vwait ::total
     } finally {
+	after cancel {set ::total timeout}
         close $s
     }
     set ::total
@@ -428,6 +436,7 @@ test zlib-9.10 "bug #2818131 (compress mismatch)" -constraints zlib -setup {
         }} $s]
         vwait ::total
     } finally {
+	after cancel {set ::total timeout}
         close $s
     }
     set ::total
@@ -460,6 +469,7 @@ test zlib-9.11 "bug #2818131 (deflate mismatch)" -constraints zlib -setup {
         }} $s]
         vwait ::total
     } finally {
+	after cancel {set ::total timeout}
         close $s
     }
     set ::total
@@ -502,6 +512,8 @@ test zlib-10.0 "bug #2818131 (close with null interp)" -constraints {
         after 100 {set ::total done}
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
+    after cancel {set ::total done}
     set ::total
 } -cleanup {
     close $srv
@@ -538,6 +550,8 @@ test zlib-10.1 "bug #2818131 (mismatch read)" -constraints {
         after 100 {set ::total done}
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
+    after cancel {set ::total done}
     set ::total
 } -cleanup {
     close $srv
@@ -576,6 +590,8 @@ test zlib-10.2 "bug #2818131 (mismatch gets)" -constraints {
         after 100 {set ::total done}
     }} $s]
     vwait ::total
+    after cancel {set ::total timeout}
+    after cancel {set ::total done}
     set ::total
 } -cleanup {
     close $srv
-- 
cgit v0.12