Commit c22e0eec authored by Salvatore Sanfilippo's avatar Salvatore Sanfilippo
Browse files

Merge pull request #461 from schlenk/unstable

Replace some unnecessary calls to echo and cat in tests
parents 4e7cc35f 875944a2
...@@ -35,7 +35,7 @@ tags {"aof"} { ...@@ -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"} { ...@@ -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"} { ...@@ -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
} }
......
...@@ -252,7 +252,7 @@ proc start_server {options {code undefined}} { ...@@ -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
......
...@@ -7,7 +7,7 @@ start_server {tags {"aofrw"}} { ...@@ -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} {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment