Merge remote-tracking branch 'origin/unstable' into bg-aof-2

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 476b58703ec37603e4f66c13ce0e3e98be642cdb..4f3cf01ec27eca0c5fb47751e870bc08273056e7 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -29,7 +29,6 @@ set ::all_tests {
     integration/replication-2
     integration/replication-3
     integration/aof
-    integration/aof-race
     unit/pubsub
     unit/slowlog
     unit/scripting