Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 451d8fd

Browse files
author
Arnon Yaari
committed
fix tests
event args were expected to be tuples, but they are lists
1 parent cd20e35 commit 451d8fd

File tree

7 files changed

+28
-28
lines changed

7 files changed

+28
-28
lines changed

‎tests/test_buffered_channel.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def client_do():
179179
client_bufchan.emit('add', (x, x * x))
180180
event = client_bufchan.recv()
181181
assert event.name == 'OK'
182-
assert event.args == (x + x * x,)
182+
assert event.args == [x + x * x]
183183
client_bufchan.close()
184184

185185
coro_pool = gevent.pool.Pool()
@@ -218,7 +218,7 @@ def client_do():
218218
client_bufchan.emit('add', (x, x * x))
219219
event = client_bufchan.recv()
220220
assert event.name == 'OK'
221-
assert event.args == (x + x * x,)
221+
assert event.args == [x + x * x]
222222
client_bufchan.emit('add', (x, x * x))
223223
with assert_raises(zerorpc.LostRemote):
224224
event = client_bufchan.recv()
@@ -264,7 +264,7 @@ def client_do():
264264
client_bufchan.emit('add', (x, x * x))
265265
event = client_bufchan.recv()
266266
assert event.name == 'OK'
267-
assert event.args == (x + x * x,)
267+
assert event.args == [x + x * x]
268268
client_bufchan.close()
269269

270270
coro_pool = gevent.pool.Pool()
@@ -312,7 +312,7 @@ def client_do():
312312
client_bufchan.emit('sleep', (x,))
313313
event = client_bufchan.recv(timeout=3)
314314
assert event.name == 'OK'
315-
assert event.args == (x,)
315+
assert event.args == [x]
316316
client_bufchan.close()
317317

318318
coro_pool = gevent.pool.Pool()

‎tests/test_channel.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ def test_events_channel_client_side():
4343

4444
event = server.recv()
4545
print event
46-
assert event.args == (42,)
46+
assert event.args == [42]
4747
assert event.header.get('zmqid', None) is not None
4848

4949
server.emit('someanswer', (21,),
5050
xheader=dict(response_to=event.header['message_id'],
5151
zmqid=event.header['zmqid']))
5252
event = client_channel.recv()
53-
assert event.args == (21,)
53+
assert event.args == [21]
5454

5555

5656
def test_events_channel_client_side_server_send_many():
@@ -68,7 +68,7 @@ def test_events_channel_client_side_server_send_many():
6868

6969
event = server.recv()
7070
print event
71-
assert event.args == (10,)
71+
assert event.args == [10]
7272
assert event.header.get('zmqid', None) is not None
7373

7474
for x in xrange(10):
@@ -77,7 +77,7 @@ def test_events_channel_client_side_server_send_many():
7777
zmqid=event.header['zmqid']))
7878
for x in xrange(10):
7979
event = client_channel.recv()
80-
assert event.args == (x,)
80+
assert event.args == [x]
8181

8282

8383
def test_events_channel_both_side():
@@ -95,20 +95,20 @@ def test_events_channel_both_side():
9595

9696
event = server.recv()
9797
print event
98-
assert event.args == (42,)
98+
assert event.args == [42]
9999
assert event.name == 'openthat'
100100

101101
server_channel = server.channel(event)
102102
server_channel.emit('test', (21,))
103103

104104
event = client_channel.recv()
105-
assert event.args == (21,)
105+
assert event.args == [21]
106106
assert event.name == 'test'
107107

108108
server_channel.emit('test', (22,))
109109

110110
event = client_channel.recv()
111-
assert event.args == (22,)
111+
assert event.args == [22]
112112
assert event.name == 'test'
113113

114114
server_events.close()

‎tests/test_events.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def test_event():
7373

7474
assert unpacked.name == 'mylittleevent4'
7575
assert unpacked.header['message_id'] == 3
76-
assert unpacked.args == ('b', 21)
76+
assert unpacked.args == ['b', 21]
7777

7878
event = zerorpc.Event('mylittleevent5', ('c', 24, True),
7979
header={'lol': 'rofl'}, context=None)
@@ -104,7 +104,7 @@ def test_events_req_rep():
104104
event = server.recv()
105105
print event
106106
assert event.name == 'myevent'
107-
assert event.args == ('arg1',)
107+
assert event.args == ['arg1']
108108

109109

110110
def test_events_req_rep2():
@@ -120,13 +120,13 @@ def test_events_req_rep2():
120120
event = server.recv()
121121
print event
122122
assert event.name == 'myevent' + str(i)
123-
assert event.args == (i,)
123+
assert event.args == [i]
124124

125125
server.emit('answser' + str(i * 2), (i * 2,))
126126
event = client.recv()
127127
print event
128128
assert event.name == 'answser' + str(i * 2)
129-
assert event.args == (i * 2,)
129+
assert event.args == [i * 2]
130130

131131

132132
def test_events_dealer_router():
@@ -142,14 +142,14 @@ def test_events_dealer_router():
142142
event = server.recv()
143143
print event
144144
assert event.name == 'myevent' + str(i)
145-
assert event.args == (i,)
145+
assert event.args == [i]
146146

147147
server.emit('answser' + str(i * 2), (i * 2,),
148148
xheader=dict(zmqid=event.header['zmqid']))
149149
event = client.recv()
150150
print event
151151
assert event.name == 'answser' + str(i * 2)
152-
assert event.args == (i * 2,)
152+
assert event.args == [i * 2]
153153

154154

155155
def test_events_push_pull():
@@ -167,4 +167,4 @@ def test_events_push_pull():
167167
event = server.recv()
168168
print event
169169
assert event.name == 'myevent'
170-
assert event.args == (x,)
170+
assert event.args == [x]

‎tests/test_heartbeat.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ def client_do():
169169
client_hbchan.emit('add', (x, x * x))
170170
event = client_hbchan.recv()
171171
assert event.name == 'OK'
172-
assert event.args == (x + x * x,)
172+
assert event.args == [x + x * x]
173173
client_hbchan.close()
174174

175175
client_task = gevent.spawn(client_do)
@@ -207,7 +207,7 @@ def client_do():
207207
client_hbchan.emit('add', (x, x * x))
208208
event = client_hbchan.recv()
209209
assert event.name == 'OK'
210-
assert event.args == (x + x * x,)
210+
assert event.args == [x + x * x]
211211
client_hbchan.emit('add', (x, x * x))
212212
with assert_raises(zerorpc.LostRemote):
213213
event = client_hbchan.recv()
@@ -251,7 +251,7 @@ def client_do():
251251
client_hbchan.emit('add', (x, x * x))
252252
event = client_hbchan.recv()
253253
assert event.name == 'OK'
254-
assert event.args == (x + x * x,)
254+
assert event.args == [x + x * x]
255255
client_hbchan.close()
256256

257257
client_task = gevent.spawn(client_do)
@@ -297,7 +297,7 @@ def client_do():
297297
client_hbchan.emit('sleep', (x,))
298298
event = client_hbchan.recv(timeout=3)
299299
assert event.name == 'OK'
300-
assert event.args == (x,)
300+
assert event.args == [x]
301301
client_hbchan.close()
302302

303303
client_task = gevent.spawn(client_do)

‎tests/test_reqstream.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def xrange(self, max):
5050
client.connect(endpoint)
5151

5252
r = client.range(10)
53-
assert r == tuple(range(10))
53+
assert r == list(range(10))
5454

5555
r = client.xrange(10)
5656
assert getattr(r, 'next', None) is not None

‎tests/test_server.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ def add(self, a, b):
5353
client_channel = client.channel()
5454
client_channel.emit('lolita', tuple())
5555
event = client_channel.recv()
56-
assert event.args == (42,)
56+
assert event.args == [42]
5757
client_channel.close()
5858

5959
client_channel = client.channel()
6060
client_channel.emit('add', (1, 2))
6161
event = client_channel.recv()
62-
assert event.args == (3,)
62+
assert event.args == [3]
6363
client_channel.close()
6464
srv.stop()
6565

‎tests/test_wrapped_events.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_sub_events():
4747

4848
event = server.recv()
4949
print event
50-
assert type(event.args) is tuple
50+
assert type(event.args) is list
5151
assert event.name == 'w'
5252
subevent = event.args
5353
print 'subevent:', subevent
@@ -86,7 +86,7 @@ def emitstuff():
8686

8787
event = server.recv()
8888
print event
89-
assert type(event.args) is tuple
89+
assert type(event.args) is list
9090
assert event.name == 'w'
9191
subevent = event.args
9292
print 'subevent:', subevent
@@ -99,7 +99,7 @@ def emitstuff():
9999

100100
event = server.recv()
101101
print event
102-
assert type(event.args) is tuple
102+
assert type(event.args) is list
103103
assert event.name == 'w'
104104
subevent = event.args
105105
print 'subevent:', subevent

0 commit comments

Comments
 (0)