summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-02-22 12:39:10 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-02-22 12:39:10 (GMT)
commit96f8fc81311574307013ca7a6f4abc589600d848 (patch)
treea3b49cb96e93f232968fe08ad7aa89b5b3de6700
parent58678c630d56e744440b1f808e9fa57aba09fed9 (diff)
downloadtcl-96f8fc81311574307013ca7a6f4abc589600d848.zip
tcl-96f8fc81311574307013ca7a6f4abc589600d848.tar.gz
tcl-96f8fc81311574307013ca7a6f4abc589600d848.tar.bz2
Convert remaining env.test test-cases to tcltest-2 format
-rw-r--r--tests/env.test29
1 files changed, 13 insertions, 16 deletions
diff --git a/tests/env.test b/tests/env.test
index f9df4d6..9f59fbc 100644
--- a/tests/env.test
+++ b/tests/env.test
@@ -278,20 +278,20 @@ test env-5.4 {corner cases - unset the env array} -setup {
} -cleanup {
interp delete i
} -result {1 a 1}
-test env-5.5 {corner cases - cannot have null entries on Windows} {win} {
+test env-5.5 {corner cases - cannot have null entries on Windows} -constraints win -body {
set env() a
catch {set env()}
-} {1}
+} -result 1
-test env-6.1 {corner cases - add lots of env variables} {} {
+test env-6.1 {corner cases - add lots of env variables} -body {
set size [array size env]
for {set i 0} {$i < 100} {incr i} {
set env(BOGUS$i) $i
}
expr {[array size env] - $size}
-} 100
+} -result 100
-test env-7.1 {[219226]: whole env array should not be unset by read} {
+test env-7.1 {[219226]: whole env array should not be unset by read} -body {
set n [array size env]
set s [array startsearch env]
while {[array anymore env $s]} {
@@ -300,21 +300,18 @@ test env-7.1 {[219226]: whole env array should not be unset by read} {
}
array donesearch env $s
return $n
-} 0
-test env-7.2 {[219226]: links to env elements should not be removed by read} {
+} -result 0
+
+test env-7.2 {[219226]: links to env elements should not be removed by read} -body {
apply {{} {
set ::env(test7_2) ok
upvar env(test7_2) elem
set ::env(PATH)
- try {
- return $elem
- } finally {
- unset ::env(test7_2)
- }
+ return $elem
}}
-} ok
+} -result ok
-test env-7.3 {[9b4702]: testing existence of env(some_thing) should not destroy trace} {
+test env-7.3 {[9b4702]: testing existence of env(some_thing) should not destroy trace} -body {
apply {{} {
catch {unset ::env(test7_3)}
proc foo args {
@@ -323,9 +320,9 @@ test env-7.3 {[9b4702]: testing existence of env(some_thing) should not destroy
trace add variable ::env(not_yet_existent) write foo
info exists ::env(not_yet_existent)
set ::env(not_yet_existent) "Now I'm here";
- info exists ::env(test7_3)
+ return [info exists ::env(test7_3)]
}}
-} 1
+} -result 1
# Restore the environment variables at the end of the test.