Index: library/xotcl/tests/xocomm.test =================================================================== diff -u -r55d0e812c6b2d7895720b83d20addf87d0945c18 -r073177c8b1304443107efeeb0c334e9477346778 --- library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 55d0e812c6b2d7895720b83d20addf87d0945c18) +++ library/xotcl/tests/xocomm.test (.../xocomm.test) (revision 073177c8b1304443107efeeb0c334e9477346778) @@ -29,7 +29,7 @@ puts $startCmd } -package require xotcl::comm::httpAccess 1.2 +package require xotcl::comm::httpAccess package require xotcl::comm::ftp package require xotcl::trace @@ -66,13 +66,13 @@ # \tstatus-code: \[\[r0 set token\] set responseCode\]" #}}} -nx::Test new -msg "Trying to load image logo-100.jpg ... " -count 1 \ +nx::test new -msg "Trying to load image logo-100.jpg ... " \ -verbose 1 \ -pre "puts starting..." \ -setResult {expr {[r0::sink set contentLength] == 1706}} \ -cmd [list SimpleRequest r0 -url http://$hostport/logo-100.jpg] \ -nx::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 ... " \ -setResult {expr [[r0 set token] set responseCode] == 201} \ -pre [list file delete -force $dir/../doc/junk.junk] \ -cmd [list SimpleRequest r0 \ @@ -81,31 +81,31 @@ -data "this is a test\n" \ -contentType plain/text] -nx::Test new -msg "And download it again ... " -count 1 \ +nx::test new -msg "And download it again ... " \ -setResult {expr [r0 getContentLength] == 15} \ -post {file delete -force ../doc/junk.junk} \ -cmd [list SimpleRequest r0 -url http://$hostport/junk.junk] -nx::Test new -msg "Get protected resource ... " -count 1 \ +nx::test new -msg "Get protected resource ... " \ -setResult {expr [r0 getContentLength] > 500} \ -cmd [list SimpleRequest r0 -url http://$protectedhostport/ ] -#nx::Test new -msg "Try an FTP request $ftpURL ... " -count 1 \ +#nx::test new -msg "Try an FTP request $ftpURL ... " \ -setResult {expr [r0 getContentLength] > 100} \ -cmd [list SimpleRequest r0 -url $ftpURL] -#nx::Test new -msg "Try timeout with slow URL $slowURL ... " -count 1 \ +#nx::test new -msg "Try timeout with slow URL $slowURL ... " \ -setResult {expr {[[r0 set token] set errormsg] == {timeout exceeded}}} \ -cmd [list SimpleRequest r0 -url $slowURL -timeout 100] -nx::Test new -msg terminate -count 1 \ +nx::test new -msg terminate \ -setResult {set x 1} \ -cmd [list SimpleRequest r0 -url http://$protectedhostport/exit] \ -post {set ::forever 1} #puts stderr "present [package present xotcl::comm::connection]" #puts stderr "versions [package versions xotcl::comm::connection]" -after 1000 {nx::Test run} +after 1000 {nx::test run} catch {vwait forever}