ensure the value is swapped in before testing its encoding

This commit is contained in:
Pieter Noordhuis 2010-07-29 13:31:24 +02:00
parent cbf7e1070a
commit 86d392498b

View File

@ -33,9 +33,14 @@ proc assert_error {pattern code} {
} }
proc assert_encoding {enc key} { proc assert_encoding {enc key} {
# swapped out value doesn't have encoding, so swap in first # Swapped out values don't have an encoding, so make sure that
r debug swapin $key # the value is swapped in before checking the encoding.
assert_match "* encoding:$enc *" [r debug object $key] set dbg [r debug object $key]
while {[string match "* swapped:*" $dbg]} {
[r debug swapin $key]
set dbg [r debug object $key]
}
assert_match "* encoding:$enc *" $dbg
} }
proc assert_type {type key} { proc assert_type {type key} {