Make sure that SELECT argument is an integer or return an error.

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index 2ec3aad1c16c4bf7679af16fe45bbbdf4331ee12..853193ccdc1f5349ded96703ef9ec5db8d9624e9 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -38,8 +38,10 @@ set ::all_tests {
     unit/scripting
     unit/maxmemory
     unit/introspection
     unit/scripting
     unit/maxmemory
     unit/introspection

+    unit/limits

     unit/obuf-limits
     unit/dump
     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


@@ -403,6 +405,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"


@@ -412,6 +426,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