From 4fd9789c692f218dc5b7b34eb3b4029674ffaa03 Mon Sep 17 00:00:00 2001 From: dgp Date: Wed, 24 Jun 2009 13:51:36 +0000 Subject: Correct failures during -singleproc 1 test suite run. Correct duplicate test names. --- tests/execute.test | 3 ++- tests/http.test | 12 ++++++---- tests/http11.test | 66 +++++++++++++++++++++++++++--------------------------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/tests/execute.test b/tests/execute.test index fad153b..b277da8 100644 --- a/tests/execute.test +++ b/tests/execute.test @@ -14,7 +14,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: execute.test,v 1.31 2009/06/13 14:31:54 dgp Exp $ +# RCS: @(#) $Id: execute.test,v 1.32 2009/06/24 13:51:36 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -945,6 +945,7 @@ test execute-8.4 {Compile epoch bump effect on stack trace} -setup { } -cleanup { rename foo {} rename FOO {} + unset -nocomplain m o stack1 stack2 } -result {} test execute-8.5 {Bug 2038069} -setup { proc demo {} { diff --git a/tests/http.test b/tests/http.test index 7fac104..526dffa 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.51 2009/04/10 14:19:45 patthoyts Exp $ +# RCS: @(#) $Id: http.test,v 1.52 2009/06/24 13:51:36 dgp Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -331,11 +331,15 @@ test http-3.23 {http::geturl parse failures} -body { test http-3.24 {http::geturl parse failures} -body { http::geturl http://somewhere/path?%query } -returnCodes error -result {Illegal encoding character usage "%qu" in URL path} -test http-3.25 {http::meta} { +test http-3.25 {http::meta} -setup { + unset -nocomplain m token +} -body { set token [http::geturl $url -timeout 2000] array set m [http::meta $token] lsort [array names m] -} {Content-Length Content-Type Date} +} -cleanup { + unset -nocomplain m token +} -result {Content-Length Content-Type Date} test http-3.26 {http::meta} { set token [http::geturl $url -headers {X-Check 1} -timeout 2000] array set m [http::meta $token] @@ -545,4 +549,4 @@ rename bgerror {} # Local variables: # mode: tcl -# End: \ No newline at end of file +# End: diff --git a/tests/http11.test b/tests/http11.test index 85526f5..7fe13fa 100644 --- a/tests/http11.test +++ b/tests/http11.test @@ -77,7 +77,7 @@ makeFile "test\ # ------------------------------------------------------------------------- -test http-1.0 "normal request for document " -setup { +test http11-1.0 "normal request for document " -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html -timeout 10000] @@ -88,7 +88,7 @@ test http-1.0 "normal request for document " -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close} -test http-1.1 "normal,gzip,non-chunked" -setup { +test http11-1.1 "normal,gzip,non-chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \ @@ -101,7 +101,7 @@ test http-1.1 "normal,gzip,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok gzip {}} -test http-1.2 "normal,deflated,non-chunked" -setup { +test http11-1.2 "normal,deflated,non-chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \ @@ -114,7 +114,7 @@ test http-1.2 "normal,deflated,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok deflate {}} -test http-1.3 "normal,compressed,non-chunked" -setup { +test http11-1.3 "normal,compressed,non-chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \ @@ -127,7 +127,7 @@ test http-1.3 "normal,compressed,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok compress {}} -test http-1.4 "normal,identity,non-chunked" -setup { +test http11-1.4 "normal,identity,non-chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \ @@ -140,7 +140,7 @@ test http-1.4 "normal,identity,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok {} {}} -test http-1.5 "normal request for document, unsupported coding" -setup { +test http11-1.5 "normal request for document, unsupported coding" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -153,7 +153,7 @@ test http-1.5 "normal request for document, unsupported coding" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok {}} -test http-1.6 "normal, specify 1.1 " -setup { +test http11-1.6 "normal, specify 1.1 " -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -166,7 +166,7 @@ test http-1.6 "normal, specify 1.1 " -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close chunked} -test http-1.7 "normal, 1.1 and keepalive " -setup { +test http11-1.7 "normal, 1.1 and keepalive " -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -179,7 +179,7 @@ test http-1.7 "normal, 1.1 and keepalive " -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok {} chunked} -test http-1.8 "normal, 1.1 and keepalive, server close" -setup { +test http11-1.8 "normal, 1.1 and keepalive, server close" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html?close=1 \ @@ -192,7 +192,7 @@ test http-1.8 "normal, 1.1 and keepalive, server close" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close {}} -test http-1.9 "normal,gzip,chunked" -setup { +test http11-1.9 "normal,gzip,chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -205,7 +205,7 @@ test http-1.9 "normal,gzip,chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok gzip chunked} -test http-1.10 "normal,deflate,chunked" -setup { +test http11-1.10 "normal,deflate,chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -218,7 +218,7 @@ test http-1.10 "normal,deflate,chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok deflate chunked} -test http-1.11 "normal,compress,chunked" -setup { +test http11-1.11 "normal,compress,chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -231,7 +231,7 @@ test http-1.11 "normal,compress,chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok compress chunked} -test http-1.12 "normal,identity,chunked" -setup { +test http11-1.12 "normal,identity,chunked" -setup { variable httpd [create_httpd] } -body { set tok [http::geturl http://localhost:$httpd_port/testdoc.html \ @@ -246,7 +246,7 @@ test http-1.12 "normal,identity,chunked" -setup { # ------------------------------------------------------------------------- -test http-2.0 "-channel" -setup { +test http11-2.0 "-channel" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -264,7 +264,7 @@ test http-2.0 "-channel" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close chunked} -test http-2.1 "-channel, encoding gzip" -setup { +test http11-2.1 "-channel, encoding gzip" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -283,7 +283,7 @@ test http-2.1 "-channel, encoding gzip" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close gzip chunked} -test http-2.2 "-channel, encoding deflate" -setup { +test http11-2.2 "-channel, encoding deflate" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -302,7 +302,7 @@ test http-2.2 "-channel, encoding deflate" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close deflate chunked} -test http-2.3 "-channel,encoding compress" -setup { +test http11-2.3 "-channel,encoding compress" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -322,7 +322,7 @@ test http-2.3 "-channel,encoding compress" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close compress chunked} -test http-2.4 "-channel,encoding identity" -setup { +test http11-2.4 "-channel,encoding identity" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -342,7 +342,7 @@ test http-2.4 "-channel,encoding identity" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close {} chunked} -test http-2.5 "-channel,encoding unsupported" -setup { +test http11-2.5 "-channel,encoding unsupported" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -362,7 +362,7 @@ test http-2.5 "-channel,encoding unsupported" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close {} chunked} -test http-2.6 "-channel,encoding gzip,non-chunked" -setup { +test http11-2.6 "-channel,encoding gzip,non-chunked" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -382,7 +382,7 @@ test http-2.6 "-channel,encoding gzip,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close gzip {} 0} -test http-2.7 "-channel,encoding deflate,non-chunked" -setup { +test http11-2.7 "-channel,encoding deflate,non-chunked" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -402,7 +402,7 @@ test http-2.7 "-channel,encoding deflate,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close deflate {} 0} -test http-2.8 "-channel,encoding compress,non-chunked" -setup { +test http11-2.8 "-channel,encoding compress,non-chunked" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -422,7 +422,7 @@ test http-2.8 "-channel,encoding compress,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close compress {} 0} -test http-2.9 "-channel,encoding identity,non-chunked" -setup { +test http11-2.9 "-channel,encoding identity,non-chunked" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -442,7 +442,7 @@ test http-2.9 "-channel,encoding identity,non-chunked" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok close {} {} 0} -test http-2.10 "-channel,deflate,keepalive" -setup { +test http11-2.10 "-channel,deflate,keepalive" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -462,7 +462,7 @@ test http-2.10 "-channel,deflate,keepalive" -setup { halt_httpd } -result {ok {HTTP/1.1 200 OK} ok {} deflate chunked 0} -test http-2.11 "-channel,identity,keepalive" -setup { +test http11-2.11 "-channel,identity,keepalive" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] } -body { @@ -502,7 +502,7 @@ proc handler {var sock token} { } } -test http-3.0 "-handler,close,identity" -setup { +test http11-3.0 "-handler,close,identity" -setup { variable httpd [create_httpd] set testdata "" } -body { @@ -519,7 +519,7 @@ test http-3.0 "-handler,close,identity" -setup { halt_httpd } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0} -test http-3.1 "-handler,protocol1.0" -setup { +test http11-3.1 "-handler,protocol1.0" -setup { variable httpd [create_httpd] set testdata "" } -body { @@ -537,7 +537,7 @@ test http-3.1 "-handler,protocol1.0" -setup { halt_httpd } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0} -test http-3.2 "-handler,close,chunked" -setup { +test http11-3.2 "-handler,close,chunked" -setup { variable httpd [create_httpd] set testdata "" } -body { @@ -555,7 +555,7 @@ test http-3.2 "-handler,close,chunked" -setup { halt_httpd } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0} -test http-3.3 "-handler,keepalive,chunked" -setup { +test http11-3.3 "-handler,keepalive,chunked" -setup { variable httpd [create_httpd] set testdata "" } -body { @@ -573,7 +573,7 @@ test http-3.3 "-handler,keepalive,chunked" -setup { halt_httpd } -result {ok {HTTP/1.0 200 OK} ok close {} {} 0} -test http-4.0 "normal post request" -setup { +test http11-4.0 "normal post request" -setup { variable httpd [create_httpd] } -body { set query [http::formatQuery q 1 z 2] @@ -589,7 +589,7 @@ test http-4.0 "normal post request" -setup { halt_httpd } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 7} -test http-4.1 "normal post request, check query length" -setup { +test http11-4.1 "normal post request, check query length" -setup { variable httpd [create_httpd] } -body { set query [http::formatQuery q 1 z 2] @@ -606,7 +606,7 @@ test http-4.1 "normal post request, check query length" -setup { halt_httpd } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 7} -test http-4.2 "normal post request, check long query length" -setup { +test http11-4.2 "normal post request, check long query length" -setup { variable httpd [create_httpd] } -body { set query [string repeat a 24576] @@ -623,7 +623,7 @@ test http-4.2 "normal post request, check long query length" -setup { halt_httpd } -result {status ok code {HTTP/1.1 200 OK} crc ok connection close query-length 24576} -test http-4.3 "normal post request, check channel query length" -setup { +test http11-4.3 "normal post request, check channel query length" -setup { variable httpd [create_httpd] set chan [open [makeFile {} testfile.tmp] wb+] puts -nonewline $chan [string repeat [encoding convertto utf-8 "This is a test\n"] 8192] -- cgit v0.12