run both inmemory and diskstore tests.

This commit is contained in:
antirez 2011-01-09 19:42:56 +01:00
parent a5062bbab0
commit 322ea972fe
2 changed files with 38 additions and 37 deletions

View File

@ -13,7 +13,7 @@ set ::host 127.0.0.1
set ::port 16379 set ::port 16379
set ::traceleaks 0 set ::traceleaks 0
set ::valgrind 0 set ::valgrind 0
set ::verbose 1 set ::verbose 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
@ -110,7 +110,6 @@ proc cleanup {} {
} }
proc execute_everything {} { proc execute_everything {} {
if 0 {
execute_tests "unit/auth" execute_tests "unit/auth"
execute_tests "unit/protocol" execute_tests "unit/protocol"
execute_tests "unit/basic" execute_tests "unit/basic"
@ -127,20 +126,20 @@ proc execute_everything {} {
execute_tests "integration/aof" execute_tests "integration/aof"
# execute_tests "integration/redis-cli" # execute_tests "integration/redis-cli"
execute_tests "unit/pubsub" execute_tests "unit/pubsub"
}
# run tests with diskstore enabled # run tests with diskstore enabled
puts "Running diskstore tests... this is slow, press Ctrl+C if not interested.."
set ::diskstore 1 set ::diskstore 1
lappend ::denytags nodiskstore lappend ::denytags nodiskstore
set ::global_overrides {diskstore-enabled yes} set ::global_overrides {diskstore-enabled yes}
# execute_tests "unit/protocol" execute_tests "unit/protocol"
# execute_tests "unit/basic" execute_tests "unit/basic"
# execute_tests "unit/type/list" execute_tests "unit/type/list"
# execute_tests "unit/type/set" execute_tests "unit/type/set"
# execute_tests "unit/type/zset" execute_tests "unit/type/zset"
# execute_tests "unit/type/hash" execute_tests "unit/type/hash"
# execute_tests "unit/sort" execute_tests "unit/sort"
# execute_tests "unit/expire" execute_tests "unit/expire"
execute_tests "unit/other" execute_tests "unit/other"
execute_tests "unit/cas" execute_tests "unit/cas"
} }

View File

@ -120,34 +120,36 @@ start_server {tags {"other"}} {
list $e1 $e2 list $e1 $e2
} {1 1} } {1 1}
test {PIPELINING stresser (also a regression for the old epoll bug)} { tags {protocol nodiskstore} {
set fd2 [socket $::host $::port] test {PIPELINING stresser (also a regression for the old epoll bug)} {
fconfigure $fd2 -encoding binary -translation binary set fd2 [socket $::host $::port]
puts -nonewline $fd2 "SELECT 9\r\n" fconfigure $fd2 -encoding binary -translation binary
flush $fd2 puts -nonewline $fd2 "SELECT 9\r\n"
gets $fd2 flush $fd2
gets $fd2
for {set i 0} {$i < 100000} {incr i} { for {set i 0} {$i < 100000} {incr i} {
set q {} set q {}
set val "0000${i}0000" set val "0000${i}0000"
append q "SET key:$i $val\r\n" append q "SET key:$i $val\r\n"
puts -nonewline $fd2 $q puts -nonewline $fd2 $q
set q {} set q {}
append q "GET key:$i\r\n" append q "GET key:$i\r\n"
puts -nonewline $fd2 $q puts -nonewline $fd2 $q
} }
flush $fd2 flush $fd2
for {set i 0} {$i < 100000} {incr i} { for {set i 0} {$i < 100000} {incr i} {
gets $fd2 line gets $fd2 line
gets $fd2 count gets $fd2 count
set count [string range $count 1 end] set count [string range $count 1 end]
set val [read $fd2 $count] set val [read $fd2 $count]
read $fd2 2 read $fd2 2
} }
close $fd2 close $fd2
set _ 1 set _ 1
} {1} } {1}
}
test {MUTLI / EXEC basics} { test {MUTLI / EXEC basics} {
r del mylist r del mylist