From d0850369c4a06d6362dbaf12d873e54d6ce931cc Mon Sep 17 00:00:00 2001
From: Oran Agra <oran@redislabs.com>
Date: Sun, 11 Nov 2018 09:22:42 +0200
Subject: [PATCH] fix small test suite race conditions

---
 tests/support/util.tcl             | 8 ++++++++
 tests/unit/memefficiency.tcl       | 1 +
 tests/unit/type/stream-cgroups.tcl | 2 ++
 3 files changed, 11 insertions(+)

diff --git a/tests/support/util.tcl b/tests/support/util.tcl
index 181c865fc..74f491e48 100644
--- a/tests/support/util.tcl
+++ b/tests/support/util.tcl
@@ -91,6 +91,14 @@ proc wait_for_sync r {
     }
 }
 
+proc wait_for_ofs_sync {r1 r2} {
+    wait_for_condition 50 100 {
+        [status $r1 master_repl_offset] eq [status $r2 master_repl_offset]
+    } else {
+        fail "replica didn't sync in time"
+    }
+}
+
 # Random integer between 0 and max (excluded).
 proc randomInt {max} {
     expr {int(rand()*$max)}
diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl
index 8972d577a..d152e212c 100644
--- a/tests/unit/memefficiency.tcl
+++ b/tests/unit/memefficiency.tcl
@@ -90,6 +90,7 @@ start_server {tags {"defrag"}} {
         test "Active defrag big keys" {
             r flushdb
             r config resetstat
+            r config set save "" ;# prevent bgsave from interfereing with save below
             r config set activedefrag no
             r config set active-defrag-max-scan-fields 1000
             r config set active-defrag-threshold-lower 5
diff --git a/tests/unit/type/stream-cgroups.tcl b/tests/unit/type/stream-cgroups.tcl
index d2e0d6539..b96bc8e98 100644
--- a/tests/unit/type/stream-cgroups.tcl
+++ b/tests/unit/type/stream-cgroups.tcl
@@ -144,6 +144,8 @@ start_server {
                     }
                 }
 
+                wait_for_ofs_sync $master $slave
+
                 # Turn slave into master
                 $slave slaveof no one