From b71ebc2746c2c92514bfd0dd8b9ad48019ac2e16 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 20 Nov 2022 19:29:53 +0000 Subject: Constraints http2.9.x make no sense, when testing http2.10 --- tests/http.test | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/tests/http.test b/tests/http.test index 46242bd..08195a6 100644 --- a/tests/http.test +++ b/tests/http.test @@ -15,11 +15,9 @@ if {"::tcltest" ni [namespace children]} { package require tcltest 2.5 namespace import -force ::tcltest::* } -source [file join [file dirname [info script]] tcltests.tcl] +package require tcltests package require http 2.10 -testConstraint http2.9.7 [package vsatisfies [package provide http] 2.9.7] -testConstraint http2.9.8 [package vsatisfies [package provide http] 2.9.8] proc bgerror {args} { global errorInfo @@ -128,25 +126,25 @@ test http-1.6.$ThreadLevel {http::config} -setup { test http-2.1.$ThreadLevel {http::reset} { catch {http::reset http#1} } 0 -test http-2.2.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.2.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding iso-8859-11 } iso8859-11 -test http-2.3.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.3.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding iso-2022-kr } iso2022-kr -test http-2.4.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.4.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding shift-jis } shiftjis -test http-2.5.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.5.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding windows-437 } cp437 -test http-2.6.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.6.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding latin5 } iso8859-9 -test http-2.7.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.7.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding latin1 } iso8859-1 -test http-2.8.$ThreadLevel {http::CharsetToEncoding} http2.9.7 { +test http-2.8.$ThreadLevel {http::CharsetToEncoding} { http::CharsetToEncoding latin4 } binary @@ -483,10 +481,10 @@ test http-3.33.$ThreadLevel {http::geturl application/xml is text} -body { } -result {test 4660 /test} test http-3.34.$ThreadLevel {http::geturl -headers not a list} -returnCodes error -body { http::geturl http://test/t -headers \" -} -constraints http2.9.8 -result {Bad value for -headers ("), must be list} +} -result {Bad value for -headers ("), must be list} test http-3.35.$ThreadLevel {http::geturl -headers not even number of elements} -returnCodes error -body { http::geturl http://test/t -headers {List Length 3} -} -constraints http2.9.8 -result {Bad value for -headers (List Length 3), number of list elements must be even} +} -result {Bad value for -headers (List Length 3), number of list elements must be even} test http-4.1.$ThreadLevel {http::Event} -body { set token [http::geturl $url -keepalive 0] -- cgit v0.12 From bfdd211de9210e8b9cf5af6cf3aa03a4698ef0ee Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Sun, 20 Nov 2022 19:33:00 +0000 Subject: Don't use "package require tcltests" any more, as in other tests --- tests/http.test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/http.test b/tests/http.test index 08195a6..587e6e4 100644 --- a/tests/http.test +++ b/tests/http.test @@ -15,7 +15,7 @@ if {"::tcltest" ni [namespace children]} { package require tcltest 2.5 namespace import -force ::tcltest::* } -package require tcltests +source [file join [file dirname [info script]] tcltests.tcl] package require http 2.10 -- cgit v0.12