Skip to content

Commit 8f28db0

Browse files
gkorlandgkorland
authored
add timeout=1 to all getmessages calls (RedisJSON#598)
1 parent ed4c752 commit 8f28db0

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎tests/pytest/test_keyspace_notifications.py

+56-56
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,42 @@ def test_keyspace_set(env):
2020
pubsub.psubscribe('__key*')
2121

2222
time.sleep(1)
23-
env.assertEqual('psubscribe', pubsub.get_message()['type'])
23+
env.assertEqual('psubscribe', pubsub.get_message(timeout=1)['type'])
2424

2525
r.execute_command('JSON.SET', 'test_key', '$', '{"foo": "bar", "fu": 131}')
26-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.set')
27-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
26+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.set')
27+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
2828

2929
env.assertEqual('OK', r.execute_command('JSON.SET', 'test_key', '$.foo', '"gogo"'))
30-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.set')
31-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
30+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.set')
31+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
3232

3333
env.assertEqual([8], r.execute_command('JSON.STRAPPEND', 'test_key', '$.foo', '"toto"'))
34-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.strappend')
35-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
34+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.strappend')
35+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
3636

3737
# Negative tests should not get an event
3838
# Read-only commands should not get an event
3939
env.assertEqual(None, r.execute_command('JSON.SET', 'test_key', '$.foo.a', '"nono"'))
40-
env.assertEqual(None, pubsub.get_message())
40+
env.assertEqual(None, pubsub.get_message(timeout=1))
4141

4242
env.assertEqual([8], r.execute_command('JSON.STRLEN', 'test_key', '$.foo'))
43-
env.assertEqual(None, pubsub.get_message())
43+
env.assertEqual(None, pubsub.get_message(timeout=1))
4444

4545
env.assertEqual('["gogototo"]', r.execute_command('JSON.GET', 'test_key', '$.foo'))
46-
env.assertEqual(None, pubsub.get_message())
46+
env.assertEqual(None, pubsub.get_message(timeout=1))
4747

4848
env.assertEqual(['["gogototo"]', None], r.execute_command('JSON.MGET', 'test_key', 'test_key1', '$.foo'))
49-
env.assertEqual(None, pubsub.get_message())
49+
env.assertEqual(None, pubsub.get_message(timeout=1))
5050

5151
env.assertEqual([['foo', 'fu']], r.execute_command('JSON.OBJKEYS', 'test_key', '$'))
52-
env.assertEqual(None, pubsub.get_message())
52+
env.assertEqual(None, pubsub.get_message(timeout=1))
5353

5454
env.assertEqual([2], r.execute_command('JSON.OBJLEN', 'test_key', '$'))
55-
env.assertEqual(None, pubsub.get_message())
55+
env.assertEqual(None, pubsub.get_message(timeout=1))
5656

5757
env.assertEqual([None], r.execute_command('JSON.STRAPPEND', 'test_key', '$.fu', '"bark"'))
58-
env.assertEqual(None, pubsub.get_message())
58+
env.assertEqual(None, pubsub.get_message(timeout=1))
5959

6060

6161
def test_keyspace_arr(env):
@@ -67,56 +67,56 @@ def test_keyspace_arr(env):
6767
pubsub.psubscribe('__key*')
6868

6969
time.sleep(1)
70-
env.assertEqual('psubscribe', pubsub.get_message()['type'])
70+
env.assertEqual('psubscribe', pubsub.get_message(timeout=1)['type'])
7171

7272
r.execute_command('JSON.SET', 'test_key_arr', '$', '{"foo": [], "bar": 31}')
73-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.set')
74-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
73+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.set')
74+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
7575

7676
env.assertEqual([2], r.execute_command('JSON.ARRAPPEND', 'test_key_arr', '$.foo', '"gogo1"', '"gogo2"'))
77-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.arrappend')
78-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
77+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.arrappend')
78+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
7979

8080
env.assertEqual([4], r.execute_command('JSON.ARRINSERT', 'test_key_arr', '$.foo', 1, '"gogo3"', '"gogo4"'))
81-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.arrinsert')
82-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
81+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.arrinsert')
82+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
8383

8484
env.assertEqual(['"gogo3"'], r.execute_command('JSON.ARRPOP', 'test_key_arr', '$.foo', 1))
85-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.arrpop')
86-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
85+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.arrpop')
86+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
8787

8888
env.assertEqual([2], r.execute_command('JSON.ARRTRIM', 'test_key_arr', '$.foo', 0, 1))
89-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.arrtrim')
90-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
89+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.arrtrim')
90+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
9191

9292
# Negative tests should not get an event
9393
# Read-only commands should not get an event
9494
env.assertEqual([0], r.execute_command('JSON.ARRINDEX', 'test_key_arr', '$.foo', '"gogo1"'))
95-
env.assertEqual(None, pubsub.get_message())
95+
env.assertEqual(None, pubsub.get_message(timeout=1))
9696

9797
env.assertEqual([2], r.execute_command('JSON.ARRLEN', 'test_key_arr', '$.foo'))
98-
env.assertEqual(None, pubsub.get_message())
98+
env.assertEqual(None, pubsub.get_message(timeout=1))
9999

100100
env.assertEqual(1, r.execute_command('JSON.CLEAR', 'test_key_arr', '$.foo'))
101-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.clear')
102-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key_arr')
101+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.clear')
102+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key_arr')
103103

104104
env.assertEqual([None], r.execute_command('JSON.ARRPOP', 'test_key_arr', '$.foo')) # Empty array
105-
env.assertEqual(None, pubsub.get_message())
105+
env.assertEqual(None, pubsub.get_message(timeout=1))
106106
env.assertEqual([None], r.execute_command('JSON.ARRPOP', 'test_key_arr', '$')) # Not an array
107-
env.assertEqual(None, pubsub.get_message())
107+
env.assertEqual(None, pubsub.get_message(timeout=1))
108108

109109
# TODO add more negative test for arr path not found
110110
env.assertEqual([None], r.execute_command('JSON.ARRTRIM', 'test_key_arr', '$.bar', 0, 1)) # Not an array
111-
env.assertEqual(None, pubsub.get_message())
111+
env.assertEqual(None, pubsub.get_message(timeout=1))
112112
env.assertEqual([None], r.execute_command('JSON.ARRINSERT', 'test_key_arr', '$.bar', 1, '"barian"')) # Not an array
113-
env.assertEqual(None, pubsub.get_message())
113+
env.assertEqual(None, pubsub.get_message(timeout=1))
114114
env.assertEqual([None], r.execute_command('JSON.ARRAPPEND', 'test_key_arr', '$.bar', '"barian"')) # Not an array
115-
env.assertEqual(None, pubsub.get_message())
115+
env.assertEqual(None, pubsub.get_message(timeout=1))
116116
env.assertEqual([None], r.execute_command('JSON.ARRPOP', 'test_key_arr', '$.bar')) # Not an array
117-
env.assertEqual(None, pubsub.get_message())
117+
env.assertEqual(None, pubsub.get_message(timeout=1))
118118
env.assertEqual(0, r.execute_command('JSON.CLEAR', 'test_key_arr', '$.bar')) # Not an array
119-
env.assertEqual(None, pubsub.get_message())
119+
env.assertEqual(None, pubsub.get_message(timeout=1))
120120

121121

122122
def test_keyspace_del(env):
@@ -128,22 +128,22 @@ def test_keyspace_del(env):
128128
pubsub.psubscribe('__key*')
129129

130130
time.sleep(1)
131-
env.assertEqual('psubscribe', pubsub.get_message()['type'])
131+
env.assertEqual('psubscribe', pubsub.get_message(timeout=1)['type'])
132132

133133
r.execute_command('JSON.SET', 'test_key', '$', '{"foo": "bar", "foo2":"bar2", "foo3":"bar3"}')
134-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.set')
135-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
134+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.set')
135+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
136136

137137
env.assertEqual(1, r.execute_command('JSON.DEL', 'test_key', '$.foo'))
138-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.del')
139-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
138+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.del')
139+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
140140

141141
env.assertEqual(1, r.execute_command('JSON.FORGET', 'test_key', '$.foo3'))
142-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.del')
143-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
142+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.del')
143+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
144144

145145
env.assertEqual(0, r.execute_command('JSON.DEL', 'test_key', '$.foo'))
146-
env.assertEqual(None, pubsub.get_message())
146+
env.assertEqual(None, pubsub.get_message(timeout=1))
147147

148148
def test_keyspace_num(env):
149149
env.skipOnVersionSmaller('6.2')
@@ -154,30 +154,30 @@ def test_keyspace_num(env):
154154
pubsub.psubscribe('__key*')
155155

156156
time.sleep(1)
157-
env.assertEqual('psubscribe', pubsub.get_message()['type'])
157+
env.assertEqual('psubscribe', pubsub.get_message(timeout=1)['type'])
158158

159159
r.execute_command('JSON.SET', 'test_key', '$', '{"foo": 1, "bar": "baro"}')
160-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.set')
161-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
160+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.set')
161+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
162162

163163
env.assertEqual('[4]', r.execute_command('JSON.NUMINCRBY', 'test_key', '$.foo', 3))
164-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.numincrby')
165-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
164+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.numincrby')
165+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
166166

167167
env.assertEqual('[12]', r.execute_command('JSON.NUMMULTBY', 'test_key', '$.foo', 3))
168-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.nummultby')
169-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
168+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.nummultby')
169+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
170170

171171
env.assertEqual('[144]', r.execute_command('JSON.NUMPOWBY', 'test_key', '$.foo', 2))
172-
assert_msg(env, pubsub.get_message(), 'pmessage', 'json.numpowby')
173-
assert_msg(env, pubsub.get_message(), 'pmessage', 'test_key')
172+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'json.numpowby')
173+
assert_msg(env, pubsub.get_message(timeout=1), 'pmessage', 'test_key')
174174

175175
# Negative tests should not get an event
176176
env.assertEqual('[null]', r.execute_command('JSON.NUMINCRBY', 'test_key', '$.bar', 3))
177-
env.assertEqual(None, pubsub.get_message())
177+
env.assertEqual(None, pubsub.get_message(timeout=1))
178178

179179
env.assertEqual('[null]', r.execute_command('JSON.NUMMULTBY', 'test_key', '$.bar', 3))
180-
env.assertEqual(None, pubsub.get_message())
180+
env.assertEqual(None, pubsub.get_message(timeout=1))
181181

182182
env.assertEqual('[null]', r.execute_command('JSON.NUMPOWBY', 'test_key', '$.bar', 3))
183-
env.assertEqual(None, pubsub.get_message())
183+
env.assertEqual(None, pubsub.get_message(timeout=1))

0 commit comments

Comments
 (0)