From 2b2652d7c4a9c34b815e0903135dfe97215ce823 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Sun, 25 Mar 2018 13:03:38 +0200
Subject: [PATCH] AOF: run tests with preamble off when it makes sense.

---
 tests/integration/aof-race.tcl | 2 +-
 tests/unit/aofrw.tcl           | 2 +-
 tests/unit/other.tcl           | 2 ++
 tests/unit/scripting.tcl       | 3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/integration/aof-race.tcl b/tests/integration/aof-race.tcl
index 207f20739..fb8d71083 100644
--- a/tests/integration/aof-race.tcl
+++ b/tests/integration/aof-race.tcl
@@ -1,4 +1,4 @@
-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 aof_path "$server_path/appendonly.aof"
 
diff --git a/tests/unit/aofrw.tcl b/tests/unit/aofrw.tcl
index dff7588ff..1a686a2fa 100644
--- a/tests/unit/aofrw.tcl
+++ b/tests/unit/aofrw.tcl
@@ -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} {
         r config set appendonly yes
         waitForBgrewriteaof r
diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index 1d21b561a..965902456 100644
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -83,6 +83,7 @@ start_server {tags {"other"}} {
             } {1}
 
             test {Same dataset digest if saving/reloading as AOF?} {
+                r config set aof-use-rdb-preamble no
                 r bgrewriteaof
                 waitForBgrewriteaof r
                 r debug loadaof
@@ -126,6 +127,7 @@ start_server {tags {"other"}} {
     test {EXPIRES after AOF reload (without rewrite)} {
         r flushdb
         r config set appendonly yes
+        r config set aof-use-rdb-preamble no
         r set x somevalue
         r expire x 1000
         r setex y 2000 somevalue
diff --git a/tests/unit/scripting.tcl b/tests/unit/scripting.tcl
index be82e1559..57afae537 100644
--- a/tests/unit/scripting.tcl
+++ b/tests/unit/scripting.tcl
@@ -397,6 +397,7 @@ start_server {tags {"scripting"}} {
     test {EVAL processes writes from AOF in read-only slaves} {
         r flushall
         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("incr",KEYS[1])} 1 foo
         r eval {redis.call("incr",KEYS[1])} 1 foo
@@ -629,7 +630,7 @@ foreach cmdrepl {0 1} {
 }
 
 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" {
             r -1 slaveof [srv 0 host] [srv 0 port]
             wait_for_condition 50 100 {