DEBUG FLUSHCACHE needs to wait that everything was synched on disk

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 2b7a8957772dbd1e57b4f73bfa362fe8392f1205..aef2311c9f0cf9749376bd1ba8fdc310fe7624bd 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -13,12 +13,13 @@ set ::host 127.0.0.1
 set ::port 16379
 set ::traceleaks 0
 set ::valgrind 0
 set ::port 16379
 set ::traceleaks 0
 set ::valgrind 0

-set ::verbose 0
+set ::verbose 1

 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance
 set ::file ""; # If set, runs only the tests in this comma separated list
 set ::curfile ""; # Hold the filename of the current suite
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance
 set ::file ""; # If set, runs only the tests in this comma separated list
 set ::curfile ""; # Hold the filename of the current suite

+set ::diskstore 0; # Don't touch this by hand. The test itself will toggle it.

 
 proc execute_tests name {
     set path "tests/$name.tcl"
 
 proc execute_tests name {
     set path "tests/$name.tcl"


@@ -103,11 +104,13 @@ proc s {args} {
 }
 
 proc cleanup {} {
 }
 
 proc cleanup {} {

+    puts "Cleanup: warning may take some time..."

     catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
 }
 
 proc execute_everything {} {
     catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
 }
 
 proc execute_everything {} {

+    if 0 {

     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
     execute_tests "unit/auth"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"


@@ -124,9 +127,12 @@ proc execute_everything {} {
     execute_tests "integration/aof"
 #    execute_tests "integration/redis-cli"
     execute_tests "unit/pubsub"
     execute_tests "integration/aof"
 #    execute_tests "integration/redis-cli"
     execute_tests "unit/pubsub"

+    }

 
 

-    # run tests with VM enabled
-    set ::global_overrides {vm-enabled yes}
+    # run tests with diskstore enabled
+    set ::diskstore 1
+    lappend ::denytags nodiskstore
+    set ::global_overrides {diskstore-enabled yes}

     execute_tests "unit/protocol"
     execute_tests "unit/basic"
     execute_tests "unit/type/list"
     execute_tests "unit/protocol"
     execute_tests "unit/basic"
     execute_tests "unit/type/list"