X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/7f7499eeace8f69aeb32a4e92554eb0b144e8226..e9bc56dbed149a29e031debc27bf25f2db991cc7:/tests/integration/aof.tcl diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl index aca8a0f4..4cbe6eaa 100644 --- a/tests/integration/aof.tcl +++ b/tests/integration/aof.tcl @@ -1,4 +1,4 @@ -set defaults [list [list appendonly yes] [list appendfilename appendonly.aof]] +set defaults { appendonly {yes} appendfilename {appendonly.aof} } set server_path [tmpdir server.aof] set aof_path "$server_path/appendonly.aof" @@ -16,8 +16,8 @@ proc create_aof {code} { proc start_server_aof {overrides code} { upvar defaults defaults srv srv server_path server_path - set _defaults $defaults - set srv [start_server {overrides [lappend _defaults $overrides]}] + set config [concat $defaults $overrides] + set srv [start_server [list overrides $config]] uplevel 1 $code kill_server $srv } @@ -59,13 +59,13 @@ tags {"aof"} { ## Test that redis-check-aof indeed sees this AOF is not valid test {Short read: Utility should confirm the AOF is not valid} { catch { - exec ./redis-check-aof $aof_path + exec src/redis-check-aof $aof_path } str set _ $str } {*not valid*} test {Short read: Utility should be able to fix the AOF} { - exec echo y | ./redis-check-aof --fix $aof_path + exec echo y | src/redis-check-aof --fix $aof_path } {*Successfully truncated AOF*} ## Test that the server can be started using the truncated AOF