merge 8.6

4 files changed, 12 insertions, 16 deletions

diff --git a/tests/all.tcl b/tests/all.tcl
index 4fce323..e14bd9c 100644
--- a/tests/all.tcl
+++ b/tests/all.tcl
@@ -13,7 +13,7 @@
 package prefer latest
 package require Tcl 8.5-
 package require tcltest 2.2
-namespace import -force ::tcltest::*
+namespace import ::tcltest::*
 
 configure {*}$argv -testdir [file dirname [file dirname [file normalize [
     info script]/...]]]
diff --git a/tests/chanio.test b/tests/chanio.test
index b77f2aa..e7f51b3 100644
--- a/tests/chanio.test
+++ b/tests/chanio.test
@@ -13,16 +13,11 @@
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
+# TODO: This test is likely worthless. Confirm and remove
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
-    namespace import -force ::tcltest::*
 }
 
-::tcltest::loadTestedCommands
-catch [list package require -exact Tcltest [info patchlevel]]
-
-testConstraint testbytestring [llength [info commands testbytestring]]
-
 namespace eval ::tcl::test::io {
     namespace import ::tcltest::*
 
@@ -35,9 +30,11 @@ namespace eval ::tcl::test::io {
     variable msg
     variable expected
 
-    ::tcltest::loadTestedCommands
+    loadTestedCommands
     catch [list package require -exact Tcltest [info patchlevel]]
-
+    package require tcltests
+    
+    testConstraint testbytestring   [llength [info commands testbytestring]]
     testConstraint testchannel      [llength [info commands testchannel]]
     testConstraint openpipe         1
     testConstraint testfevent       [llength [info commands testfevent]]
diff --git a/tests/io.test b/tests/io.test
index c1d5205..683a1b2 100644
--- a/tests/io.test
+++ b/tests/io.test
@@ -15,14 +15,8 @@
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
-    namespace import -force ::tcltest::*
 }
 
-::tcltest::loadTestedCommands
-catch [list package require -exact Tcltest [info patchlevel]]
-
-testConstraint testbytestring [llength [info commands testbytestring]]
-
 namespace eval ::tcl::test::io {
     namespace import ::tcltest::*
 
@@ -35,6 +29,11 @@ namespace eval ::tcl::test::io {
     variable msg
     variable expected
 
+    loadTestedCommands
+    catch [list package require -exact Tcltest [info patchlevel]]
+    package require tcltests
+
+testConstraint testbytestring [llength [info commands testbytestring]]
 testConstraint testchannel      [llength [info commands testchannel]]
 testConstraint openpipe         1
 testConstraint testfevent       [llength [info commands testfevent]]
diff --git a/tests/tcltests.tcl b/tests/tcltests.tcl
index 2105279..74d1b40 100644
--- a/tests/tcltests.tcl
+++ b/tests/tcltests.tcl
@@ -1,7 +1,7 @@
 #! /usr/bin/env tclsh
 
 package require tcltest 2.2
-namespace import -force ::tcltest::*
+namespace import ::tcltest::*
 
 testConstraint exec          [llength [info commands exec]]
 testConstraint fcopy         [llength [info commands fcopy]]