Merge remote branch 'pietern/test-encoding-fix' into writeonexpire

tests/support/test.tcl

@@ -36,8 +36,8 @@ proc assert_encoding {enc key} {
     # Swapped out values don't have an encoding, so make sure that
     # the value is swapped in before checking the encoding.
     set dbg [r debug object $key]
-    while {[string match "* swapped:*" $dbg]} {
-        [r debug swapin $key]
+    while {[string match "* swapped at:*" $dbg]} {
+        r debug swapin $key
         set dbg [r debug object $key]
     }
     assert_match "* encoding:$enc *" $dbg