show initial querybuf bytes on querybuf overflow.

[redis.git] / tests / unit / other.tcl

diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index d2663572f6dab3df0605cdd6a532eac46eaa35d4..bb65570a46685388cbdf41e02aefe23ccb084ea0 100644 (file)
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -1,4 +1,11 @@
 start_server {tags {"other"}} {
 start_server {tags {"other"}} {

+    if {$::force_failure} {
+        # This is used just for test suite development purposes.
+        test {Failing test} {
+            format err
+        } {ok}
+    }
+

     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate
         waitForBgsave r
     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate
         waitForBgsave r


@@ -13,10 +20,11 @@ start_server {tags {"other"}} {
     } {OK}
 
     tags {slow} {
     } {OK}
 
     tags {slow} {

+        if {$::accurate} {set iterations 10000} else {set iterations 1000}

         foreach fuzztype {binary alpha compr} {
             test "FUZZ stresser with data model $fuzztype" {
                 set err 0
         foreach fuzztype {binary alpha compr} {
             test "FUZZ stresser with data model $fuzztype" {
                 set err 0

-                for {set i 0} {$i < 10000} {incr i} {
+                for {set i 0} {$i < $iterations} {incr i} {

                     set fuzz [randstring 0 512 $fuzztype]
                     r set foo $fuzz
                     set got [r get foo]
                     set fuzz [randstring 0 512 $fuzztype]
                     r set foo $fuzz
                     set got [r get foo]


@@ -48,9 +56,10 @@ start_server {tags {"other"}} {
 
     tags {consistency} {
         if {![catch {package require sha1}]} {
 
     tags {consistency} {
         if {![catch {package require sha1}]} {

+            if {$::accurate} {set numops 10000} else {set numops 1000}

             test {Check consistency of different data types after a reload} {
                 r flushdb
             test {Check consistency of different data types after a reload} {
                 r flushdb

-                createComplexDataset r 10000
+                createComplexDataset r $numops

                 set dump [csvdump r]
                 set sha1 [r debug digest]
                 r debug reload
                 set dump [csvdump r]
                 set sha1 [r debug digest]
                 r debug reload


@@ -98,7 +107,7 @@ start_server {tags {"other"}} {
         }
     }
 
         }
     }
 

-    test {EXPIRES after a reload (snapshot + append only file)} {
+    test {EXPIRES after a reload (snapshot + append only file rewrite)} {

         r flushdb
         r set x 10
         r expire x 1000
         r flushdb
         r set x 10
         r expire x 1000


@@ -114,6 +123,39 @@ start_server {tags {"other"}} {
         list $e1 $e2
     } {1 1}
 
         list $e1 $e2
     } {1 1}
 

+    test {EXPIRES after AOF reload (without rewrite)} {
+        r flushdb
+        r config set appendonly yes
+        r set x somevalue
+        r expire x 1000
+        r setex y 2000 somevalue
+        r set z somevalue
+        r expireat z [expr {[clock seconds]+3000}]
+
+        # Milliseconds variants
+        r set px somevalue
+        r pexpire px 1000000
+        r psetex py 2000000 somevalue
+        r set pz somevalue
+        r pexpireat pz [expr {([clock seconds]+3000)*1000}]
+
+        # Reload and check
+        r debug loadaof
+        set ttl [r ttl x]
+        assert {$ttl > 900 && $ttl <= 1000}
+        set ttl [r ttl y]
+        assert {$ttl > 1900 && $ttl <= 2000}
+        set ttl [r ttl z]
+        assert {$ttl > 2900 && $ttl <= 3000}
+        set ttl [r ttl px]
+        assert {$ttl > 900 && $ttl <= 1000}
+        set ttl [r ttl py]
+        assert {$ttl > 1900 && $ttl <= 2000}
+        set ttl [r ttl pz]
+        assert {$ttl > 2900 && $ttl <= 3000}
+        r config set appendonly no
+    }
+

     tags {protocol} {
         test {PIPELINING stresser (also a regression for the old epoll bug)} {
             set fd2 [socket $::host $::port]
     tags {protocol} {
         test {PIPELINING stresser (also a regression for the old epoll bug)} {
             set fd2 [socket $::host $::port]


@@ -238,6 +280,7 @@ start_server {tags {"other"}} {
     } {0 0}
 
     test {Perform a final SAVE to leave a clean DB on disk} {
     } {0 0}
 
     test {Perform a final SAVE to leave a clean DB on disk} {

+        waitForBgsave r

         r save
     } {OK}
 }
         r save
     } {OK}
 }