Merge pull request #414 from chobits/unstable

[redis.git] / tests / integration / aof.tcl

diff --git a/tests/integration/aof.tcl b/tests/integration/aof.tcl
index 927969b627525f5f774b6226f92949df1cbb00a3..9c93b6a6ed66a47122371884673ed6686c9c0e6e 100644 (file)
--- a/tests/integration/aof.tcl
+++ b/tests/integration/aof.tcl
@@ -31,13 +31,20 @@ tags {"aof"} {
     }
 
     start_server_aof [list dir $server_path] {
     }
 
     start_server_aof [list dir $server_path] {

-        test "Unfinished MULTI: Server should not have been started" {
-            assert_equal 0 [is_alive $srv]
-        }
-

         test "Unfinished MULTI: Server should have logged an error" {
         test "Unfinished MULTI: Server should have logged an error" {

-            set result [exec cat [dict get $srv stdout] | tail -n1]
-            assert_match "*Unexpected end of file reading the append only file*" $result
+            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]
+                if {[string match $pattern $result]} {
+                    break
+                }
+                incr retry -1
+                after 1000
+            }
+            if {$retry == 0} {
+                error "assertion:expected error not found on config file"
+            }

         }
     }
 
         }
     }
 


@@ -48,13 +55,20 @@ tags {"aof"} {
     }
 
     start_server_aof [list dir $server_path] {
     }
 
     start_server_aof [list dir $server_path] {

-        test "Short read: Server should not have been started" {
-            assert_equal 0 [is_alive $srv]
-        }
-

         test "Short read: Server should have logged an error" {
         test "Short read: Server should have logged an error" {

-            set result [exec cat [dict get $srv stdout] | tail -n1]
-            assert_match "*Bad file format reading the append only file*" $result
+            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]
+                if {[string match $pattern $result]} {
+                    break
+                }
+                incr retry -1
+                after 1000
+            }
+            if {$retry == 0} {
+                error "assertion:expected error not found on config file"
+            }

         }
     }
 
         }
     }
 


@@ -101,4 +115,29 @@ tags {"aof"} {
             assert_equal 1 [$client scard set]
         }
     }
             assert_equal 1 [$client scard set]
         }
     }

+
+    ## Test that EXPIREAT is loaded correctly
+    create_aof {
+        append_to_aof [formatCommand rpush list foo]
+        append_to_aof [formatCommand expireat list 1000]
+        append_to_aof [formatCommand rpush list bar]
+    }
+
+    start_server_aof [list dir $server_path] {
+        test "AOF+EXPIRE: Server should have been started" {
+            assert_equal 1 [is_alive $srv]
+        }
+
+        test "AOF+EXPIRE: List should be empty" {
+            set client [redis [dict get $srv host] [dict get $srv port]]
+            assert_equal 0 [$client llen list]
+        }
+    }
+
+    start_server {overrides {appendonly {yes} appendfilename {appendonly.aof}}} {
+        test {Redis should not try to convert DEL into EXPIREAT for EXPIRE -1} {
+            r set x 10
+            r expire x -1
+        }
+    }

 }
 }