summaryrefslogtreecommitdiff
path: root/tests/unit
diff options
context:
space:
mode:
authorSebastian Waisbrot <seppo0010@users.noreply.github.com>2015-08-11 22:56:17 -0700
committerSebastian Waisbrot <seppo0010@users.noreply.github.com>2015-08-11 22:56:17 -0700
commit97a2248309937a2cecb8b800af40526e06fc64c4 (patch)
tree59a5b643e40dbd65649ecc1d170e8d38670469c2 /tests/unit
parentbea1259190a9f3c3850b074ef7d0af0bc3ea36a7 (diff)
downloadredis-97a2248309937a2cecb8b800af40526e06fc64c4.tar.gz
Fix race condition in unit/introspection
Make sure monitor is attached in one connection before issuing commands to be monitored in another one
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/introspection.tcl7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/unit/introspection.tcl b/tests/unit/introspection.tcl
index 342bb939a..f6477d9c5 100644
--- a/tests/unit/introspection.tcl
+++ b/tests/unit/introspection.tcl
@@ -6,16 +6,17 @@ start_server {tags {"introspection"}} {
test {MONITOR can log executed commands} {
set rd [redis_deferring_client]
$rd monitor
+ assert_match {*OK*} [$rd read]
r set foo bar
r get foo
- list [$rd read] [$rd read] [$rd read]
- } {*OK*"set" "foo"*"get" "foo"*}
+ list [$rd read] [$rd read]
+ } {*"set" "foo"*"get" "foo"*}
test {MONITOR can log commands issued by the scripting engine} {
set rd [redis_deferring_client]
$rd monitor
- r eval {redis.call('set',KEYS[1],ARGV[1])} 1 foo bar
$rd read ;# Discard the OK
+ r eval {redis.call('set',KEYS[1],ARGV[1])} 1 foo bar
assert_match {*eval*} [$rd read]
assert_match {*lua*"set"*"foo"*"bar"*} [$rd read]
}