Fix key archival configuration from static config.

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index bef8231a71a0d020bd2cc5fabb3887ed3fe976bf..86230db71fc9f51ccbfc9de7f5a2be2ae1098641 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -23,12 +23,14 @@ set ::all_tests {
     unit/sort
     unit/expire
     unit/other
     unit/sort
     unit/expire
     unit/other

-    unit/cas
+    unit/multi

     unit/quit
     unit/aofrw
     unit/quit
     unit/aofrw

+    unit/archive

     integration/replication
     integration/replication-2
     integration/replication-3
     integration/replication
     integration/replication-2
     integration/replication-3

+    integration/replication-4

     integration/aof
     integration/rdb
     integration/convert-zipmap-hash-on-load
     integration/aof
     integration/rdb
     integration/convert-zipmap-hash-on-load


@@ -37,7 +39,10 @@ set ::all_tests {
     unit/scripting
     unit/maxmemory
     unit/introspection
     unit/scripting
     unit/maxmemory
     unit/introspection

+    unit/limits

     unit/obuf-limits
     unit/obuf-limits

+    unit/dump
+    unit/bitops

 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0


@@ -343,6 +348,7 @@ proc print_help_screen {} {
         "--quiet            Don't show individual tests."
         "--single <unit>    Just execute the specified unit (see next option)."
         "--list-tests       List all the available test units."
         "--quiet            Don't show individual tests."
         "--single <unit>    Just execute the specified unit (see next option)."
         "--list-tests       List all the available test units."

+        "--clients <num>    Number of test clients (16)."

         "--force-failure    Force the execution of a test that always fails."
         "--help             Print this help screen."
     } "\n"]
         "--force-failure    Force the execution of a test that always fails."
         "--help             Print this help screen."
     } "\n"]


@@ -388,6 +394,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         set ::client 1
         set ::test_server_port $arg
         incr j
         set ::client 1
         set ::test_server_port $arg
         incr j

+    } elseif {$opt eq {--clients}} {
+        set ::numclients $arg
+        incr j

     } elseif {$opt eq {--help}} {
         print_help_screen
         exit 0
     } elseif {$opt eq {--help}} {
         print_help_screen
         exit 0


@@ -397,6 +406,18 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
     }
 }
 
     }
 }
 

+# With the parallel test running multiple Redis instances at the same time
+# we need a fast enough computer, otherwise a lot of tests may generate
+# false positives.
+# If the computer is too slow we revert the sequetial test without any
+# parallelism, that is, clients == 1.
+proc is_a_slow_computer {} {
+    set start [clock milliseconds]
+    for {set j 0} {$j < 1000000} {incr j} {}
+    set elapsed [expr [clock milliseconds]-$start]
+    expr {$elapsed > 200}
+}
+

 if {$::client} {
     if {[catch { test_client_main $::test_server_port } err]} {
         set estr "Executing test client: $err.\n$::errorInfo"
 if {$::client} {
     if {[catch { test_client_main $::test_server_port } err]} {
         set estr "Executing test client: $err.\n$::errorInfo"


@@ -406,6 +427,11 @@ if {$::client} {
         exit 1
     }
 } else {
         exit 1
     }
 } else {

+    if {[is_a_slow_computer]} {
+        puts "** SLOW COMPUTER ** Using a single client to avoid false positives."
+        set ::numclients 1
+    }
+

     if {[catch { test_server_main } err]} {
         if {[string length $err] > 0} {
             # only display error when not generated by the test suite
     if {[catch { test_server_main } err]} {
         if {[string length $err] > 0} {
             # only display error when not generated by the test suite