summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-05-22 16:03:46 +0200
committerantirez <antirez@gmail.com>2014-05-23 09:26:04 +0200
commit308c570e04291fea823710197871fc0b80e5a278 (patch)
treeaad9cf68f5fa5af66737d3f0c2f255901836fee2
parent1d7031202811c5ec1141f64d0d37154723f42d63 (diff)
downloadredis-308c570e04291fea823710197871fc0b80e5a278.tar.gz
Test: AOF test false positive when running in slow hosts.
The bug was triggered by running the test with Valgrind (which is a lot slower and more sensible to timing issues) after the recent changes that made Redis more promptly able to reply with the -LOADING error.
-rw-r--r--tests/integration/aof.tcl17
1 files changed, 16 insertions, 1 deletions
diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl
index f255d7ec1..9a24a96bd 100644
--- a/tests/integration/aof.tcl
+++ b/tests/integration/aof.tcl
@@ -91,8 +91,13 @@ tags {"aof"} {
assert_equal 1 [is_alive $srv]
}
- test "Fixed AOF: Keyspace should contain values that were parsable" {
+ test "Fixed AOF: Keyspace should contain values that were parsable" {
set client [redis [dict get $srv host] [dict get $srv port]]
+ wait_for_condition 50 100 {
+ [catch {$client ping} e] == 0
+ } else {
+ fail "Loading DB is taking too much time."
+ }
assert_equal "hello" [$client get foo]
assert_equal "" [$client get bar]
}
@@ -112,6 +117,11 @@ tags {"aof"} {
test "AOF+SPOP: Set should have 1 member" {
set client [redis [dict get $srv host] [dict get $srv port]]
+ wait_for_condition 50 100 {
+ [catch {$client ping} e] == 0
+ } else {
+ fail "Loading DB is taking too much time."
+ }
assert_equal 1 [$client scard set]
}
}
@@ -130,6 +140,11 @@ tags {"aof"} {
test "AOF+EXPIRE: List should be empty" {
set client [redis [dict get $srv host] [dict get $srv port]]
+ wait_for_condition 50 100 {
+ [catch {$client ping} e] == 0
+ } else {
+ fail "Loading DB is taking too much time."
+ }
assert_equal 0 [$client llen list]
}
}