diff options
author | antirez <antirez@gmail.com> | 2012-11-17 11:17:54 +0100 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-11-22 10:36:28 +0100 |
commit | 37d978d9b46c0572d0aa0a3ae72fa684c0eccd0a (patch) | |
tree | 47eaa718fb353faa5e1b7caa0490be7a212d2dce | |
parent | 41f0f927c97aafc2a7a42006491fca9181fab14c (diff) | |
download | redis-37d978d9b46c0572d0aa0a3ae72fa684c0eccd0a.tar.gz |
Test: MULTI/EXEC tests moved into multi.tcl.
-rw-r--r-- | tests/test_helper.tcl | 2 | ||||
-rw-r--r-- | tests/unit/multi.tcl (renamed from tests/unit/cas.tcl) | 49 | ||||
-rw-r--r-- | tests/unit/other.tcl | 47 |
3 files changed, 49 insertions, 49 deletions
diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl index 853193ccd..38fb1f539 100644 --- a/tests/test_helper.tcl +++ b/tests/test_helper.tcl @@ -23,7 +23,7 @@ set ::all_tests { unit/sort unit/expire unit/other - unit/cas + unit/multi unit/quit unit/aofrw integration/replication diff --git a/tests/unit/cas.tcl b/tests/unit/multi.tcl index 95766abe4..9069b95be 100644 --- a/tests/unit/cas.tcl +++ b/tests/unit/multi.tcl @@ -1,4 +1,51 @@ -start_server {tags {"cas"}} { +start_server {tags {"multi"}} { + test {MUTLI / EXEC basics} { + r del mylist + r rpush mylist a + r rpush mylist b + r rpush mylist c + r multi + set v1 [r lrange mylist 0 -1] + set v2 [r ping] + set v3 [r exec] + list $v1 $v2 $v3 + } {QUEUED QUEUED {{a b c} PONG}} + + test {DISCARD} { + r del mylist + r rpush mylist a + r rpush mylist b + r rpush mylist c + r multi + set v1 [r del mylist] + set v2 [r discard] + set v3 [r lrange mylist 0 -1] + list $v1 $v2 $v3 + } {QUEUED OK {a b c}} + + test {Nested MULTI are not allowed} { + set err {} + r multi + catch {[r multi]} err + r exec + set _ $err + } {*ERR MULTI*} + + test {MULTI where commands alter argc/argv} { + r sadd myset a + r multi + r spop myset + list [r exec] [r exists myset] + } {a 0} + + test {WATCH inside MULTI is not allowed} { + set err {} + r multi + catch {[r watch x]} err + r exec + set _ $err + } {*ERR WATCH*} + test {EXEC works on WATCHed key not modified} { r watch x y z r watch k diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl index 14fd73ac7..a53f3f5c8 100644 --- a/tests/unit/other.tcl +++ b/tests/unit/other.tcl @@ -193,53 +193,6 @@ start_server {tags {"other"}} { } {1} } - test {MUTLI / EXEC basics} { - r del mylist - r rpush mylist a - r rpush mylist b - r rpush mylist c - r multi - set v1 [r lrange mylist 0 -1] - set v2 [r ping] - set v3 [r exec] - list $v1 $v2 $v3 - } {QUEUED QUEUED {{a b c} PONG}} - - test {DISCARD} { - r del mylist - r rpush mylist a - r rpush mylist b - r rpush mylist c - r multi - set v1 [r del mylist] - set v2 [r discard] - set v3 [r lrange mylist 0 -1] - list $v1 $v2 $v3 - } {QUEUED OK {a b c}} - - test {Nested MULTI are not allowed} { - set err {} - r multi - catch {[r multi]} err - r exec - set _ $err - } {*ERR MULTI*} - - test {MULTI where commands alter argc/argv} { - r sadd myset a - r multi - r spop myset - list [r exec] [r exists myset] - } {a 0} - - test {WATCH inside MULTI is not allowed} { - set err {} - r multi - catch {[r watch x]} err - r exec - set _ $err - } {*ERR WATCH*} - test {APPEND basics} { list [r append foo bar] [r get foo] \ [r append foo 100] [r get foo] |