fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-03 16:21:03 +00:00
Code Issues Projects Releases Wiki Activity

Replace unnecessary calls to echo and cat

Browse Source 
Tcl's exec can send data to stdout itself, no need to call cat/echo for
that usually.
This commit is contained in:
Michael Schlenker 2012-04-17 22:20:54 +02:00
parent 6a3f0ac68a
commit 875944a23f
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/integration/aof.tcl
View File

@ -35,7 +35,7 @@ tags {"aof"} {
set pattern "*Unexpected end of file reading the append only file*" set pattern "*Unexpected end of file reading the append only file*"
set retry 10 set retry 10
while {$retry} { 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]} { if {[string match $pattern $result]} {
break break
} }
@ -59,7 +59,7 @@ tags {"aof"} {
set pattern "*Bad file format reading the append only file*" set pattern "*Bad file format reading the append only file*"
set retry 10 set retry 10
while {$retry} { 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]} { if {[string match $pattern $result]} {
break break
} }
@ -81,7 +81,7 @@ tags {"aof"} {
} }
test "Short read: Utility should be able to fix the 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 assert_match "*Successfully truncated AOF*" $result
} }

2
tests/support/server.tcl
View File

@ -252,7 +252,7 @@ proc start_server {options {code undefined}} {
while 1 { while 1 {
# check that the server actually started and is ready for connections # 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 break
} }
after 10 after 10

2
tests/unit/aofrw.tcl
View File

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