Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
38b957d8
Commit
38b957d8
authored
Nov 29, 2011
by
antirez
Browse files
--quiet option implemented in the Redis test. Output improved a bit.
parent
63fd1399
Changes
1
Show whitespace changes
Inline
Side-by-side
tests/test_helper.tcl
View file @
38b957d8
...
@@ -42,6 +42,7 @@ set ::port 21111
...
@@ -42,6 +42,7 @@ set ::port 21111
set ::traceleaks 0
set ::traceleaks 0
set ::valgrind 0
set ::valgrind 0
set ::verbose 0
set ::verbose 0
set ::quiet 0
set ::denytags
{}
set ::denytags
{}
set ::allowtags
{}
set ::allowtags
{}
set ::external 0
;
# If
"1"
this means, we are running against external instance
set ::external 0
;
# If
"1"
this means, we are running against external instance
...
@@ -142,11 +143,11 @@ proc s {args} {
...
@@ -142,11 +143,11 @@ proc s {args} {
}
}
proc cleanup
{}
{
proc cleanup
{}
{
puts -nonewline
"Cleanup: may take some time... "
if
{
!$::quiet
}
{
puts -nonewline
"Cleanup: may take some time... "
}
flush stdout
flush stdout
catch
{
exec rm -rf
{*}
[
glob tests/tmp/redis.conf.*
]}
catch
{
exec rm -rf
{*}
[
glob tests/tmp/redis.conf.*
]}
catch
{
exec rm -rf
{*}
[
glob tests/tmp/server.*
]}
catch
{
exec rm -rf
{*}
[
glob tests/tmp/server.*
]}
puts
"OK"
if
{
!$::quiet
}
{
puts
"OK"
}
}
}
proc find_available_port start
{
proc find_available_port start
{
...
@@ -169,7 +170,9 @@ proc test_server_main {} {
...
@@ -169,7 +170,9 @@ proc test_server_main {} {
# Open a listening socket, trying different ports in order to find a
# Open a listening socket, trying different ports in order to find a
# non busy one.
# non busy one.
set port
[
find_available_port 11111
]
set port
[
find_available_port 11111
]
if
{
!$::quiet
}
{
puts
"Starting test server at port
$port
"
puts
"Starting test server at port
$port
"
}
socket -server accept_test_clients $port
socket -server accept_test_clients $port
# Start the client instances
# Start the client instances
...
@@ -223,16 +226,22 @@ proc read_from_test_client fd {
...
@@ -223,16 +226,22 @@ proc read_from_test_client fd {
set payload
[
read $fd $bytes
]
set payload
[
read $fd $bytes
]
foreach
{
status data
}
$payload break
foreach
{
status data
}
$payload break
if
{
$status
eq
{
ready
}}
{
if
{
$status
eq
{
ready
}}
{
if
{
!$::quiet
}
{
puts
"
\[
$status
\]
:
$data
"
puts
"
\[
$status
\]
:
$data
"
}
signal_idle_client $fd
signal_idle_client $fd
}
elseif
{
$status
eq
{
done
}}
{
}
elseif
{
$status
eq
{
done
}}
{
set elapsed
[
expr
{[
clock seconds
]
-$::clients_start_time
(
$fd
)}]
set elapsed
[
expr
{[
clock seconds
]
-$::clients_start_time
(
$fd
)}]
puts
"
\[
[
colorstr yellow $status
]
\]
:
$data
(
$elapsed
seconds)"
set all_tests_count
[
llength $::all_tests
]
puts
"+++
[
expr
{[
llength $::active_clients
]
-1
}]
units still in execution."
set running_tests_count
[
expr
{[
llength $::active_clients
]
-1
}]
set completed_tests_count
[
expr
{
$::next
_test-$running_tests_count
}]
puts
"
\[
$completed
_tests_count/
$all
_tests_count
[
colorstr yellow $status
]
\]
:
$data
(
$elapsed
seconds)"
lappend ::clients_time_history $elapsed $data
lappend ::clients_time_history $elapsed $data
signal_idle_client $fd
signal_idle_client $fd
}
elseif
{
$status
eq
{
ok
}}
{
}
elseif
{
$status
eq
{
ok
}}
{
if
{
!$::quiet
}
{
puts
"
\[
[
colorstr green $status
]
\]
:
$data
"
puts
"
\[
[
colorstr green $status
]
\]
:
$data
"
}
}
elseif
{
$status
eq
{
err
}}
{
}
elseif
{
$status
eq
{
err
}}
{
set err
"
\[
[
colorstr red $status
]
\]
:
$data
"
set err
"
\[
[
colorstr red $status
]
\]
:
$data
"
puts $err
puts $err
...
@@ -246,8 +255,10 @@ proc read_from_test_client fd {
...
@@ -246,8 +255,10 @@ proc read_from_test_client fd {
}
elseif
{
$status
eq
{
testing
}}
{
}
elseif
{
$status
eq
{
testing
}}
{
# No op
# No op
}
else
{
}
else
{
if
{
!$::quiet
}
{
puts
"
\[
$status
\]
:
$data
"
puts
"
\[
$status
\]
:
$data
"
}
}
}
}
}
# A new client is idle. Remove it from the list of active clients and
# A new client is idle. Remove it from the list of active clients and
...
@@ -258,7 +269,9 @@ proc signal_idle_client fd {
...
@@ -258,7 +269,9 @@ proc signal_idle_client fd {
[
lsearch -all -inline -not -exact $::active_clients $fd
]
[
lsearch -all -inline -not -exact $::active_clients $fd
]
# New unit to process?
# New unit to process?
if
{
$::next
_test !=
[
llength $::all_tests
]}
{
if
{
$::next
_test !=
[
llength $::all_tests
]}
{
if
{
!$::quiet
}
{
puts
[
colorstr bold-white
"Testing
[
lindex $::all_tests $::next_test
]
"
]
puts
[
colorstr bold-white
"Testing
[
lindex $::all_tests $::next_test
]
"
]
}
set ::clients_start_time
(
$fd
)
[
clock seconds
]
set ::clients_start_time
(
$fd
)
[
clock seconds
]
send_data_packet $fd run
[
lindex $::all_tests $::next_test
]
send_data_packet $fd run
[
lindex $::all_tests $::next_test
]
lappend ::active_clients $fd
lappend ::active_clients $fd
...
@@ -322,6 +335,7 @@ proc print_help_screen {} {
...
@@ -322,6 +335,7 @@ proc print_help_screen {} {
puts
[
join
{
puts
[
join
{
"--valgrind Run the test over valgrind."
"--valgrind Run the test over valgrind."
"--accurate Run slow randomized tests for more iterations."
"--accurate Run slow randomized tests for more iterations."
"--quiet Don't show individual tests."
"--single <unit> Just execute the specified unit (see next option)."
"--single <unit> Just execute the specified unit (see next option)."
"--list-tests List all the available test units."
"--list-tests List all the available test units."
"--force-failure Force the execution of a test that always fails."
"--force-failure Force the execution of a test that always fails."
...
@@ -344,6 +358,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
...
@@ -344,6 +358,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
incr j
incr j
}
elseif
{
$opt
eq
{
--valgrind
}}
{
}
elseif
{
$opt
eq
{
--valgrind
}}
{
set ::valgrind 1
set ::valgrind 1
}
elseif
{
$opt
eq
{
--quiet
}}
{
set ::quiet 1
}
elseif
{
$opt
eq
{
--host
}}
{
}
elseif
{
$opt
eq
{
--host
}}
{
set ::external 1
set ::external 1
set ::host $arg
set ::host $arg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment