Commit 2b2652d7 authored by antirez's avatar antirez
Browse files

AOF: run tests with preamble off when it makes sense.

parent 28d28ef3
set defaults { appendonly {yes} appendfilename {appendonly.aof} } set defaults { appendonly {yes} appendfilename {appendonly.aof} aof-use-rdb-preamble {no} }
set server_path [tmpdir server.aof] set server_path [tmpdir server.aof]
set aof_path "$server_path/appendonly.aof" set aof_path "$server_path/appendonly.aof"
......
...@@ -64,7 +64,7 @@ start_server {tags {"aofrw"}} { ...@@ -64,7 +64,7 @@ start_server {tags {"aofrw"}} {
} }
} }
start_server {tags {"aofrw"}} { start_server {tags {"aofrw"} overrides {aof-use-rdb-preamble no}} {
test {Turning off AOF kills the background writing child if any} { test {Turning off AOF kills the background writing child if any} {
r config set appendonly yes r config set appendonly yes
waitForBgrewriteaof r waitForBgrewriteaof r
......
...@@ -83,6 +83,7 @@ start_server {tags {"other"}} { ...@@ -83,6 +83,7 @@ start_server {tags {"other"}} {
} {1} } {1}
test {Same dataset digest if saving/reloading as AOF?} { test {Same dataset digest if saving/reloading as AOF?} {
r config set aof-use-rdb-preamble no
r bgrewriteaof r bgrewriteaof
waitForBgrewriteaof r waitForBgrewriteaof r
r debug loadaof r debug loadaof
...@@ -126,6 +127,7 @@ start_server {tags {"other"}} { ...@@ -126,6 +127,7 @@ start_server {tags {"other"}} {
test {EXPIRES after AOF reload (without rewrite)} { test {EXPIRES after AOF reload (without rewrite)} {
r flushdb r flushdb
r config set appendonly yes r config set appendonly yes
r config set aof-use-rdb-preamble no
r set x somevalue r set x somevalue
r expire x 1000 r expire x 1000
r setex y 2000 somevalue r setex y 2000 somevalue
......
...@@ -397,6 +397,7 @@ start_server {tags {"scripting"}} { ...@@ -397,6 +397,7 @@ start_server {tags {"scripting"}} {
test {EVAL processes writes from AOF in read-only slaves} { test {EVAL processes writes from AOF in read-only slaves} {
r flushall r flushall
r config set appendonly yes r config set appendonly yes
r config set aof-use-rdb-preamble no
r eval {redis.call("set",KEYS[1],"100")} 1 foo r eval {redis.call("set",KEYS[1],"100")} 1 foo
r eval {redis.call("incr",KEYS[1])} 1 foo r eval {redis.call("incr",KEYS[1])} 1 foo
r eval {redis.call("incr",KEYS[1])} 1 foo r eval {redis.call("incr",KEYS[1])} 1 foo
...@@ -629,7 +630,7 @@ foreach cmdrepl {0 1} { ...@@ -629,7 +630,7 @@ foreach cmdrepl {0 1} {
} }
start_server {tags {"scripting repl"}} { start_server {tags {"scripting repl"}} {
start_server {overrides {appendonly yes}} { start_server {overrides {appendonly yes aof-use-rdb-preamble no}} {
test "Connect a slave to the master instance" { test "Connect a slave to the master instance" {
r -1 slaveof [srv 0 host] [srv 0 port] r -1 slaveof [srv 0 host] [srv 0 port]
wait_for_condition 50 100 { wait_for_condition 50 100 {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment