From 04e2410d2dcfc14c938ac56877929e96baa99d28 Mon Sep 17 00:00:00 2001 From: antirez Date: Mon, 11 Jul 2011 12:44:55 +0200 Subject: [PATCH] initial support for failed tests summary at end of the test. --- tests/test_helper.tcl | 21 ++++++++++++++++++--- tests/unit/other.tcl | 7 +++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl index 8611326a6..6624ff285 100644 --- a/tests/test_helper.tcl +++ b/tests/test_helper.tcl @@ -46,6 +46,7 @@ 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 ::accurate 0; # If true runs fuzz tests with more iterations +set ::force_failure 0 # Set to 1 when we are running in client mode. The Redis test uses a # server-client model to run tests simultaneously. The server instance @@ -183,6 +184,7 @@ proc test_server_main {} { set ::active_clients {} array set ::clients_start_time {} set ::clients_time_history {} + set ::failed_tests {} # Enter the event loop to handle clients I/O after 100 test_server_cron @@ -228,7 +230,9 @@ proc read_from_test_client fd { } elseif {$status eq {ok}} { puts "\[[colorstr green $status]\]: $data" } elseif {$status eq {err}} { - puts "\[[colorstr red $status]\]: $data" + set err "\[[colorstr red $status]\]: $data" + puts $err + lappend ::failed_tests $err } elseif {$status eq {exception}} { puts "\[[colorstr red $status]\]: $data" foreach p $::clients_pids { @@ -267,12 +271,21 @@ proc signal_idle_client fd { # executed, so the test finished. proc the_end {} { # TODO: print the status, exit with the rigth exit code. - puts "The End\n" + puts "\n The End\n" puts "Execution time of different units:" foreach {time name} $::clients_time_history { puts " $time seconds - $name" } - exit 1 + if {[llength $::failed_tests]} { + puts "!!! WARNING: The following tests failed\n" + foreach failed $::failed_tests { + puts "*** $failed" + } + exit 1 + } else { + puts "\n[colorstr bold-white {\o/}] [colorstr bold-green {All tests passed without errors!}]\n" + exit 0 + } } # The client is not even driven (the test server is instead) as we just need @@ -328,6 +341,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} { set ::verbose 1 } elseif {$opt eq {--accurate}} { set ::accurate 1 + } elseif {$opt eq {--force-failure}} { + set ::force_failure 1 } elseif {$opt eq {--single}} { set ::all_tests $arg incr j diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl index 20cefc6a0..dff577159 100644 --- a/tests/unit/other.tcl +++ b/tests/unit/other.tcl @@ -242,4 +242,11 @@ start_server {tags {"other"}} { test {Perform a final SAVE to leave a clean DB on disk} { r save } {OK} + + if {$::force_failure} { + # This is used just for test suite development purposes. + test {Failing test} { + format err + } {ok} + } }