9 files changed, 22 insertions, 10 deletions
diff --git a/tests/foreach.test b/tests/foreach.test
index 07fbe22..4042b3c 100644
--- a/tests/foreach.test
+++ b/tests/foreach.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: foreach.test,v 1.14 2008/03/14 17:43:25 dgp Exp $
+# RCS: @(#) $Id: foreach.test,v 1.15 2009/06/24 15:17:40 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -271,5 +271,6 @@ test foreach-10.1 {foreach: [Bug 1671087]} -setup {
 # cleanup
 catch {unset a}
 catch {unset x}
+catch {rename foo {}}
 ::tcltest::cleanupTests
 return
diff --git a/tests/http.test b/tests/http.test
index 526dffa..2516a48 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.52 2009/06/24 13:51:36 dgp Exp $
+# RCS: @(#) $Id: http.test,v 1.53 2009/06/24 15:17:40 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -340,11 +340,15 @@ test http-3.25 {http::meta} -setup {
 } -cleanup {
     unset -nocomplain m token
 } -result {Content-Length Content-Type Date}
-test http-3.26 {http::meta} {
+test http-3.26 {http::meta} -setup {
+    unset -nocomplain m token
+} -body {
     set token [http::geturl $url -headers {X-Check 1} -timeout 2000]
     array set m [http::meta $token]
     lsort [array names m]
-} {Content-Length Content-Type Date X-Check}
+} -cleanup {
+    unset -nocomplain m token
+} -result {Content-Length Content-Type Date X-Check}
 
 test http-4.1 {http::Event} {
     set token [http::geturl $url -keepalive 0]
diff --git a/tests/http11.test b/tests/http11.test
index 7fe13fa..0ed60c9 100644
--- a/tests/http11.test
+++ b/tests/http11.test
@@ -650,6 +650,7 @@ test http11-4.3 "normal post request, check channel query length" -setup {
 foreach p {create_httpd httpd_read halt_httpd meta check_crc} {
     rename $p {}
 }
+removeFile testdoc.html
 unset -nocomplain httpd_port httpd p
 
 ::tcltest::cleanupTests
diff --git a/tests/oo.test b/tests/oo.test
index da295a6..7b28f00 100644
--- a/tests/oo.test
+++ b/tests/oo.test
@@ -7,7 +7,7 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: oo.test,v 1.27 2009/05/15 10:08:02 dkf Exp $
+# RCS: @(#) $Id: oo.test,v 1.28 2009/06/24 15:17:40 dgp Exp $
 
 package require TclOO 0.6.1 ;# Must match value in generic/tclOO.h
 if {[lsearch [namespace children] ::tcltest] == -1} {
@@ -690,6 +690,7 @@ test oo-7.6 {OO: inheritance 101 - overridden methods should be oblivious} -setu
     lappend result [Binstance incr x]
     lappend result x=$x
 } -result {x=10 x 1 returning:11 11 x=11} -cleanup {
+    unset -nocomplain x
     Aclass destroy
 }
 test oo-7.7 {OO: inheritance and errorInfo} -setup {
diff --git a/tests/set-old.test b/tests/set-old.test
index 1a0d5e9..150d6f7 100644
--- a/tests/set-old.test
+++ b/tests/set-old.test
@@ -13,7 +13,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: set-old.test,v 1.20 2008/07/19 22:50:39 nijtmans Exp $
+# RCS: @(#) $Id: set-old.test,v 1.21 2009/06/24 15:17:40 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -913,6 +913,7 @@ catch {unset a}
 catch {unset b}
 catch {unset c}
 catch {unset aVaRnAmE}
+catch {rename foo {}}
 
 # cleanup
 ::tcltest::cleanupTests
diff --git a/tests/string.test b/tests/string.test
index 536189f..3fc1153 100644
--- a/tests/string.test
+++ b/tests/string.test
@@ -12,7 +12,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: string.test,v 1.76 2008/10/14 18:49:47 dgp Exp $
+# RCS: @(#) $Id: string.test,v 1.77 2009/06/24 15:17:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -1868,6 +1868,7 @@ test string-28.13 {tcl::prefix longest} {
 
 # cleanup
 rename MemStress {}
+catch {rename foo {}}
 ::tcltest::cleanupTests
 return
 
diff --git a/tests/stringComp.test b/tests/stringComp.test
index c4680fb..2f187be 100644
--- a/tests/stringComp.test
+++ b/tests/stringComp.test
@@ -15,7 +15,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: stringComp.test,v 1.16 2008/07/19 22:50:38 nijtmans Exp $
+# RCS: @(#) $Id: stringComp.test,v 1.17 2009/06/24 15:17:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -714,5 +714,6 @@ test stringComp-11.54 {string match, failure} {
 ## not yet bc
 
 # cleanup
+catch {rename foo {}}
 ::tcltest::cleanupTests
 return
diff --git a/tests/switch.test b/tests/switch.test
index db346e9..2652a70 100644
--- a/tests/switch.test
+++ b/tests/switch.test
@@ -11,7 +11,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: switch.test,v 1.23 2008/07/21 22:22:28 nijtmans Exp $
+# RCS: @(#) $Id: switch.test,v 1.24 2009/06/24 15:17:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -739,6 +739,7 @@ test switch-14.16 {switch -regexp compilation} {
 } no
 
 # cleanup
+catch {rename foo {}}
 ::tcltest::cleanupTests
 return
 
diff --git a/tests/tailcall.test b/tests/tailcall.test
index 0d0bf65..8eea3e9 100644
--- a/tests/tailcall.test
+++ b/tests/tailcall.test
@@ -9,7 +9,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: tailcall.test,v 1.7 2009/03/21 12:56:32 msofer Exp $
+# RCS: @(#) $Id: tailcall.test,v 1.8 2009/06/24 15:17:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -167,6 +167,7 @@ test tailcall-0.6 {tailcall is constant space} -constraints {testnrelevels known
 } -result {0 0 0 0 0 0}
 
 test tailcall-0.7 {tailcall is constant space} -constraints testnrelevels -setup {
+    catch {rename foo {}}
     oo::class create foo {
 	method b i {
 	    if {[incr i] > 10} {