disabled development test entry, tests moved in the right place

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

diff --git a/tests/unit/expire.tcl b/tests/unit/expire.tcl
index 5954194c681afb1af590506fbc552f924cba50a1..6f16ed58956a1d0605e84a7061e294969aac360f 100644 (file)
--- a/tests/unit/expire.tcl
+++ b/tests/unit/expire.tcl
@@ -1,29 +1,32 @@
-start_server default.conf {} {
-    test {EXPIRE - don't set timeouts multiple times} {
+start_server {tags {"expire"}} {
+    test {EXPIRE - set timeouts multiple times} {

         r set x foobar
         set v1 [r expire x 5]
         set v2 [r ttl x]
         set v3 [r expire x 10]
         set v4 [r ttl x]
         r set x foobar
         set v1 [r expire x 5]
         set v2 [r ttl x]
         set v3 [r expire x 10]
         set v4 [r ttl x]

+        r expire x 4

         list $v1 $v2 $v3 $v4
         list $v1 $v2 $v3 $v4

-    } {1 5 0 5}
+    } {1 5 1 10}

 
     test {EXPIRE - It should be still possible to read 'x'} {
         r get x
     } {foobar}
 
 
     test {EXPIRE - It should be still possible to read 'x'} {
         r get x
     } {foobar}
 

-    test {EXPIRE - After 6 seconds the key should no longer be here} {
-        after 6000
-        list [r get x] [r exists x]
-    } {{} 0}
+    tags {"slow"} {
+        test {EXPIRE - After 6 seconds the key should no longer be here} {
+            after 6000
+            list [r get x] [r exists x]
+        } {{} 0}
+    }

 
 

-    test {EXPIRE - Delete on write policy} {
+    test {EXPIRE - write on expire should work} {

         r del x
         r lpush x foo
         r expire x 1000
         r lpush x bar
         r lrange x 0 -1
         r del x
         r lpush x foo
         r expire x 1000
         r lpush x bar
         r lrange x 0 -1

-    } {bar}
+    } {bar foo}

 
     test {EXPIREAT - Check for EXPIRE alike behavior} {
         r del x
 
     test {EXPIREAT - Check for EXPIRE alike behavior} {
         r del x


@@ -46,13 +49,26 @@ start_server default.conf {} {
         r get y
     } {foo}
 
         r get y
     } {foo}
 

-    test {SETEX - Wait for the key to expire} {
-        after 3000
-        r get y
-    } {}
+    tags {"slow"} {
+        test {SETEX - Wait for the key to expire} {
+            after 3000
+            r get y
+        } {}
+    }

 
     test {SETEX - Wrong time parameter} {
         catch {r setex z -10 foo} e
         set _ $e
     } {*invalid expire*}
 
     test {SETEX - Wrong time parameter} {
         catch {r setex z -10 foo} e
         set _ $e
     } {*invalid expire*}

+
+    test {PERSIST can undo an EXPIRE} {
+        r set x foo
+        r expire x 50
+        list [r ttl x] [r persist x] [r ttl x] [r get x]
+    } {50 1 -1 foo}
+
+    test {PERSIST returns 0 against non existing or non volatile keys} {
+        r set x foo
+        list [r persist foo] [r persist nokeyatall]
+    } {0 0}

 }
 }