Merge pull request #461 from schlenk/unstable

Replace some unnecessary calls to echo and cat in tests
This commit is contained in:
Salvatore Sanfilippo 2012-04-23 02:07:21 -07:00
commit c22e0eecd5
3 changed files with 5 additions and 5 deletions

View File

@ -35,7 +35,7 @@ tags {"aof"} {
set pattern "*Unexpected end of file reading the append only file*"
set retry 10
while {$retry} {
set result [exec cat [dict get $srv stdout] | tail -n1]
set result [exec tail -n1 < [dict get $srv stdout]]
if {[string match $pattern $result]} {
break
}
@ -59,7 +59,7 @@ tags {"aof"} {
set pattern "*Bad file format reading the append only file*"
set retry 10
while {$retry} {
set result [exec cat [dict get $srv stdout] | tail -n1]
set result [exec tail -n1 < [dict get $srv stdout]]
if {[string match $pattern $result]} {
break
}
@ -81,7 +81,7 @@ tags {"aof"} {
}
test "Short read: Utility should be able to fix the AOF" {
set result [exec echo y | src/redis-check-aof --fix $aof_path]
set result [exec src/redis-check-aof --fix $aof_path << "y\n"]
assert_match "*Successfully truncated AOF*" $result
}

View File

@ -252,7 +252,7 @@ proc start_server {options {code undefined}} {
while 1 {
# check that the server actually started and is ready for connections
if {[exec cat $stdout | grep "ready to accept" | wc -l] > 0} {
if {[exec grep "ready to accept" | wc -l < $stdout] > 0} {
break
}
after 10

View File

@ -7,7 +7,7 @@ start_server {tags {"aofrw"}} {
r bgrewriteaof
r config set appendonly no
r exec
set result [exec cat [srv 0 stdout] | tail -n1]
set result [exec tail -n1 < [srv 0 stdout] ]
} {*Killing*AOF*child*}
foreach d {string int} {