Index: library/xotcl/tests/xocomm.test
===================================================================
diff -u -ra7b06fee23b709e9b7033e1de5b31cd81b00ead0 -re02cb00ae815bd6f8561a6a03fceacc13fd91903
--- library/xotcl/tests/xocomm.test	(.../xocomm.test)	(revision a7b06fee23b709e9b7033e1de5b31cd81b00ead0)
+++ library/xotcl/tests/xocomm.test	(.../xocomm.test)	(revision e02cb00ae815bd6f8561a6a03fceacc13fd91903)
@@ -66,13 +66,13 @@
 #          \tstatus-code: \[\[r0 set token\] set responseCode\]"
 #}}}
 
-Test new -msg "Trying to load image logo-100.jpg ... " -count 1 \
+nx::Test new -msg "Trying to load image logo-100.jpg ... " -count 1 \
      -verbose 1 \
      -pre "puts starting..." \
     -setResult {expr {[r0::sink set contentLength] == 1706}} \
     -cmd [list SimpleRequest r0 -url http://$hostport/logo-100.jpg] \
 
-Test new -msg "Trying to PUT a file on web-server ... " -count 1 \
+nx::Test new -msg "Trying to PUT a file on web-server ... " -count 1 \
     -setResult {expr [[r0 set token] set responseCode] == 201} \
     -pre [list file delete -force $dir/../doc/junk.junk] \
     -cmd [list SimpleRequest r0 \
@@ -81,28 +81,28 @@
 	      -data "this is a test\n" \
 	      -contentType plain/text]
 
-Test new -msg "And download it again ... " -count 1 \
+nx::Test new -msg "And download it again ... " -count 1 \
     -setResult {expr [r0 getContentLength] == 15} \
     -post {file delete -force ../doc/junk.junk} \
     -cmd [list SimpleRequest r0 -url http://$hostport/junk.junk]
 
-Test new -msg "Get protected resource ... " -count 1 \
+nx::Test new -msg "Get protected resource ... " -count 1 \
     -setResult {expr [r0 getContentLength] > 500} \
     -cmd [list SimpleRequest r0 -url http://$protectedhostport/ ]
 
-#Test new -msg "Try an FTP request $ftpURL ... "  -count 1 \
+#nx::Test new -msg "Try an FTP request $ftpURL ... "  -count 1 \
     -setResult {expr [r0 getContentLength] > 100} \
     -cmd [list SimpleRequest r0 -url $ftpURL]
 
-#Test new -msg "Try timeout with slow URL $slowURL ... "  -count 1 \
+#nx::Test new -msg "Try timeout with slow URL $slowURL ... "  -count 1 \
     -setResult {expr {[[r0 set token] set errormsg] == {timeout exceeded}}} \
     -cmd [list SimpleRequest r0 -url $slowURL -timeout 100]
 
-Test new -msg terminate -count 1 \
+nx::Test new -msg terminate -count 1 \
     -setResult {set x 1} \
     -cmd [list SimpleRequest r0 -url http://$protectedhostport/exit] \
     -post exit
 
-after 1000 {Test run}
+after 1000 {nx::Test run}
 catch {vwait forever}