source tests/support/test.tcl
source tests/support/util.tcl
+set ::all_tests {
+ unit/printver
+ unit/auth
+ unit/protocol
+ unit/basic
+ unit/type/list
+ unit/type/set
+ unit/type/zset
+ unit/type/hash
+ unit/sort
+ unit/expire
+ unit/other
+ unit/cas
+ unit/quit
+ integration/replication
+ integration/aof
+ unit/pubsub
+ unit/slowlog
+}
+# Index to the next test to run in the ::all_tests list.
+set ::next_test 0
+
set ::host 127.0.0.1
set ::port 16379
set ::traceleaks 0
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.
+
+# 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
+# runs the specified number of client instances that will actually run tests.
+# The server is responsible of showing the result to the user, and exit with
+# the appropriate exit code depending on the test outcome.
+set ::client 0
+set ::numclients 16
proc execute_tests name {
set path "tests/$name.tcl"
set ::curfile $path
source $path
+ send_data_packet $::test_server_fd done "$name finished"
}
# Setup a list to hold a stack of server configs. When calls to start_server
}
proc cleanup {} {
- puts "Cleanup: warning may take some time..."
+ puts -nonewline "Cleanup: warning may take some time... "
+ flush stdout
catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
catch {exec rm -rf {*}[glob tests/tmp/server.*]}
+ puts "OK"
}
-proc execute_everything {} {
- if 0 {
- # Use this when hacking on new tests.
- set ::verbose 1
- execute_tests "unit/first"
- return
+proc test_server_main {} {
+ cleanup
+ # Open a listening socket, trying different ports in order to find a
+ # non busy one.
+ set port 11111
+ while 1 {
+ puts "Starting test server at port $port"
+ if {[catch {socket -server accept_test_clients $port} e]} {
+ if {[string match {*address already in use*} $e]} {
+ if {$port == 20000} {
+ puts "Can't find an available TCP port for test server."
+ exit 1
+ } else {
+ incr port
+ }
+ } else {
+ puts "Fatal error starting test server: $e"
+ exit 1
+ }
+ } else {
+ break
+ }
}
- execute_tests "unit/printver"
- execute_tests "unit/auth"
- execute_tests "unit/protocol"
- execute_tests "unit/basic"
- execute_tests "unit/type/list"
- execute_tests "unit/type/set"
- execute_tests "unit/type/zset"
- execute_tests "unit/type/hash"
- execute_tests "unit/sort"
- execute_tests "unit/expire"
- execute_tests "unit/other"
- execute_tests "unit/cas"
- execute_tests "unit/quit"
- execute_tests "integration/replication"
- execute_tests "integration/aof"
- execute_tests "unit/pubsub"
- execute_tests "unit/slowlog"
-}
-
-proc main {} {
- cleanup
- set exit_with_error 0
+ # Start the client instances
+ for {set j 0} {$j < $::numclients} {incr j} {
+ exec tclsh8.5 [info script] {*}$::argv \
+ --client $port --port [expr {$::port+($j*10)}] &
+ }
- if {[string length $::file] > 0} {
- foreach {file} [split $::file ,] {
- execute_tests $file
- }
+ # Setup global state for the test server
+ set ::idle_clients {}
+ set ::active_clients {}
+
+ # Enter the event loop to handle clients I/O
+ after 100 test_server_cron
+ vwait forever
+}
+
+# This function gets called 10 times per second, for now does nothing but
+# may be used in the future in order to detect test clients taking too much
+# time to execute the task.
+proc test_server_cron {} {
+}
+
+proc accept_test_clients {fd addr port} {
+ fileevent $fd readable [list read_from_test_client $fd]
+}
+
+# This is the readable handler of our test server. Clients send us messages
+# in the form of a status code such and additional data. Supported
+# status types are:
+#
+# ready: the client is ready to execute the command. Only sent at client
+# startup. The server will queue the client FD in the list of idle
+# clients.
+# testing: just used to signal that a given test started.
+# ok: a test was executed with success.
+# err: a test was executed with an error.
+# exception: there was a runtime exception while executing the test.
+# done: all the specified test file was processed, this test client is
+# ready to accept a new task.
+proc read_from_test_client fd {
+ set bytes [gets $fd]
+ set payload [read $fd $bytes]
+ foreach {status data} $payload break
+ puts "($fd) \[$status\]: $data"
+ if {$status eq {ready}} {
+ signal_idle_client $fd
+ } elseif {$status eq {done}} {
+ signal_idle_client $fd
+ puts "+++ [llength $::active_clients] units still in execution."
+ }
+}
+
+# A new client is idle. Remove it from the list of active clients and
+# if there are still test units to run, launch them.
+proc signal_idle_client fd {
+ # Remove this fd from the list of active clients.
+ set ::active_clients \
+ [lsearch -all -inline -not -exact $::active_clients $fd]
+ # New unit to process?
+ if {$::next_test != [llength $::all_tests]} {
+ puts "Spawing new test process for: [lindex $::all_tests $::next_test]"
+ send_data_packet $fd run [lindex $::all_tests $::next_test]
+ lappend ::active_clients $fd
+ incr ::next_test
} else {
- execute_everything
+ lappend ::idle_clients $fd
+ if {[llength $::active_clients] == 0} {
+ the_end
+ }
}
+}
- cleanup
- puts "\n[expr $::num_tests] tests, $::num_passed passed, $::num_failed failed\n"
- if {$::num_failed > 0} {
- set curheader ""
- puts "Failures:"
- foreach {test} $::tests_failed {
- set header [lindex $test 0]
- append header " ("
- append header [join [lindex $test 1] ","]
- append header ")"
-
- if {$curheader ne $header} {
- set curheader $header
- puts "\n$curheader:"
- }
+# The the_end funciton gets called when all the test units were already
+# executed, so the test finished.
+proc the_end {} {
+ # TODO: print the status, exit with the rigth exit code.
+ puts "The End"
+ exit 1
+}
- set name [lindex $test 2]
- set msg [lindex $test 3]
- puts "- $name: $msg"
+# The client is not even driven (the test server is instead) as we just need
+# to read the command, execute, reply... all this in a loop.
+proc test_client_main server_port {
+ set ::test_server_fd [socket localhost $server_port]
+ send_data_packet $::test_server_fd ready [pid]
+ while 1 {
+ set bytes [gets $::test_server_fd]
+ set payload [read $::test_server_fd $bytes]
+ foreach {cmd data} $payload break
+ if {$cmd eq {run}} {
+ execute_tests $data
+ } else {
+ error "Unknown test client command: $cmd"
}
-
- puts ""
- incr exit_with_error
}
+}
- if {[string length $::valgrind_errors]} {
- puts "Valgrind errors:\n$::valgrind_errors"
- incr exit_with_error
- }
- if {$exit_with_error} {exit 1}
+proc send_data_packet {fd status data} {
+ set payload [list $status $data]
+ puts $fd [string length $payload]
+ puts -nonewline $fd $payload
+ flush $fd
}
# parse arguments
incr j
} elseif {$opt eq {--verbose}} {
set ::verbose 1
+ } elseif {$opt eq {--client}} {
+ set ::client 1
+ set ::test_server_port $arg
+ incr j
} else {
puts "Wrong argument: $opt"
exit 1
}
}
-if {[catch { main } err]} {
- if {[string length $err] > 0} {
- # only display error when not generated by the test suite
- if {$err ne "exception"} {
- puts $::errorInfo
+if {$::client} {
+ if {[catch { test_client_main $::test_server_port } err]} {
+ set estr "Executing test client: $err.\n$::errorInfo"
+ if {[catch {send_data_packet $::test_server_fd exception $estr}]} {
+ puts $estr
}
exit 1
}
+} else {
+ if {[catch { test_server_main } err]} {
+ if {[string length $err] > 0} {
+ # only display error when not generated by the test suite
+ if {$err ne "exception"} {
+ puts $::errorInfo
+ }
+ exit 1
+ }
+ }
}
projects / redis.git / commitdiff
