merge conflict resolved

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

diff --git a/tests/unit/cas.tcl b/tests/unit/cas.tcl
index dc6a5ef7c38cbae2d5cf9da6dec1f32ed817a7da..d420d9e29fbe8a9cf73f092fe43c4f0bb456bfae 100644 (file)
--- a/tests/unit/cas.tcl
+++ b/tests/unit/cas.tcl
@@ -111,4 +111,25 @@ start_server {tags {"cas"}} {
         r ping
         r exec
     } {PONG}
+
+    test {WATCH will consider touched keys target of EXPIRE} {
+        r del x
+        r set x foo
+        r watch x
+        r expire x 10
+        r multi
+        r ping
+        r exec
+    } {}
+
+    test {WATCH will not consider touched expired keys} {
+        r del x
+        r set x foo
+        r expire x 2
+        r watch x
+        after 3000
+        r multi
+        r ping
+        r exec
+    } {PONG}
 }