diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/integration/aof.tcl | 6 | ||||
| -rw-r--r-- | tests/integration/rdb.tcl | 4 | ||||
| -rw-r--r-- | tests/integration/replication-psync.tcl | 2 | ||||
| -rw-r--r-- | tests/unit/aofrw.tcl | 2 | ||||
| -rw-r--r-- | tests/unit/type/hash.tcl | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl index 832f996e1..e397faeeb 100644 --- a/tests/integration/aof.tcl +++ b/tests/integration/aof.tcl @@ -88,7 +88,7 @@ tags {"aof"} { set pattern "*Bad file format reading the append only file*" set retry 10 while {$retry} { - set result [exec tail -n1 < [dict get $srv stdout]] + set result [exec tail -1 < [dict get $srv stdout]] if {[string match $pattern $result]} { break } @@ -113,7 +113,7 @@ tags {"aof"} { set pattern "*Unexpected end of file reading the append only file*" set retry 10 while {$retry} { - set result [exec tail -n1 < [dict get $srv stdout]] + set result [exec tail -1 < [dict get $srv stdout]] if {[string match $pattern $result]} { break } @@ -137,7 +137,7 @@ tags {"aof"} { set pattern "*Unexpected end of file reading the append only file*" set retry 10 while {$retry} { - set result [exec tail -n1 < [dict get $srv stdout]] + set result [exec tail -1 < [dict get $srv stdout]] if {[string match $pattern $result]} { break } diff --git a/tests/integration/rdb.tcl b/tests/integration/rdb.tcl index 2ed47cc58..66aad4cc7 100644 --- a/tests/integration/rdb.tcl +++ b/tests/integration/rdb.tcl @@ -66,7 +66,7 @@ if {!$isroot} { test {Server should not start if RDB file can't be open} { wait_for_condition 50 100 { [string match {*Fatal error loading*} \ - [exec tail -n1 < [dict get $srv stdout]]] + [exec tail -1 < [dict get $srv stdout]]] } else { fail "Server started even if RDB was unreadable!" } @@ -90,7 +90,7 @@ start_server_and_kill_it [list "dir" $server_path] { test {Server should not start if RDB is corrupted} { wait_for_condition 50 100 { [string match {*CRC error*} \ - [exec tail -n10 < [dict get $srv stdout]]] + [exec tail -10 < [dict get $srv stdout]]] } else { fail "Server started even if RDB was corrupted!" } diff --git a/tests/integration/replication-psync.tcl b/tests/integration/replication-psync.tcl index 3a41ceb21..da1e9cf5b 100644 --- a/tests/integration/replication-psync.tcl +++ b/tests/integration/replication-psync.tcl @@ -47,7 +47,7 @@ proc test_psync {descr duration backlog_size backlog_ttl delay cond diskless rec # Check that the background clients are actually writing. test {Detect write load to master} { - wait_for_condition 50 100 { + wait_for_condition 50 1000 { [$master dbsize] > 100 } else { fail "Can't detect write load from background clients." diff --git a/tests/unit/aofrw.tcl b/tests/unit/aofrw.tcl index c5430eedc..dff7588ff 100644 --- a/tests/unit/aofrw.tcl +++ b/tests/unit/aofrw.tcl @@ -73,7 +73,7 @@ start_server {tags {"aofrw"}} { r config set appendonly no r exec wait_for_condition 50 100 { - [string match {*Killing*AOF*child*} [exec tail -n5 < [srv 0 stdout]]] + [string match {*Killing*AOF*child*} [exec tail -5 < [srv 0 stdout]]] } else { fail "Can't find 'Killing AOF child' into recent logs" } diff --git a/tests/unit/type/hash.tcl b/tests/unit/type/hash.tcl index 02560ede2..d2c679d32 100644 --- a/tests/unit/type/hash.tcl +++ b/tests/unit/type/hash.tcl @@ -525,7 +525,7 @@ start_server {tags {"hash"}} { # 1.23 cannot be represented correctly with 64 bit doubles, so we skip # the test, since we are only testing pretty printing here and is not # a bug if the program outputs things like 1.299999... - if {!$::valgrind || ![string match *x86_64* [exec uname -a]]} { + if {!$::valgrind && [string match *x86_64* [exec uname -a]]} { test {Test HINCRBYFLOAT for correct float representation (issue #2846)} { r del myhash assert {[r hincrbyfloat myhash float 1.23] eq {1.23}} |