tests - support event.args as both tuple and list

Arnon Yaari · Arnon Yaari · commit aa734c76030c · 2013-10-24T18:57:27.000+03:00
diff --git a/tests/test_buffered_channel.py b/tests/test_buffered_channel.py
@@ -179,7 +179,7 @@ def client_do():
             client_bufchan.emit('add', (x, x * x))
             event = client_bufchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_bufchan.close()
 
     coro_pool = gevent.pool.Pool()
@@ -218,7 +218,7 @@ def client_do():
             client_bufchan.emit('add', (x, x * x))
             event = client_bufchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_bufchan.emit('add', (x, x * x))
         with assert_raises(zerorpc.LostRemote):
             event = client_bufchan.recv()
@@ -264,7 +264,7 @@ def client_do():
             client_bufchan.emit('add', (x, x * x))
             event = client_bufchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_bufchan.close()
 
     coro_pool = gevent.pool.Pool()
@@ -312,7 +312,7 @@ def client_do():
                 client_bufchan.emit('sleep', (x,))
                 event = client_bufchan.recv(timeout=3)
                 assert event.name == 'OK'
-                assert event.args == [x]
+                assert list(event.args) == [x]
         client_bufchan.close()
 
     coro_pool = gevent.pool.Pool()
diff --git a/tests/test_channel.py b/tests/test_channel.py
@@ -43,14 +43,14 @@ def test_events_channel_client_side():
 
     event = server.recv()
     print event
-    assert event.args == [42]
+    assert list(event.args) == [42]
     assert event.header.get('zmqid', None) is not None
 
     server.emit('someanswer', (21,),
             xheader=dict(response_to=event.header['message_id'],
                 zmqid=event.header['zmqid']))
     event = client_channel.recv()
-    assert event.args == [21]
+    assert list(event.args) == [21]
 
 
 def test_events_channel_client_side_server_send_many():
@@ -68,7 +68,7 @@ def test_events_channel_client_side_server_send_many():
 
     event = server.recv()
     print event
-    assert event.args == [10]
+    assert list(event.args) == [10]
     assert event.header.get('zmqid', None) is not None
 
     for x in xrange(10):
@@ -77,7 +77,7 @@ def test_events_channel_client_side_server_send_many():
                     zmqid=event.header['zmqid']))
     for x in xrange(10):
         event = client_channel.recv()
-        assert event.args == [x]
+        assert list(event.args) == [x]
 
 
 def test_events_channel_both_side():
@@ -95,20 +95,20 @@ def test_events_channel_both_side():
 
     event = server.recv()
     print event
-    assert event.args == [42]
+    assert list(event.args) == [42]
     assert event.name == 'openthat'
 
     server_channel = server.channel(event)
     server_channel.emit('test', (21,))
 
     event = client_channel.recv()
-    assert event.args == [21]
+    assert list(event.args) == [21]
     assert event.name == 'test'
 
     server_channel.emit('test', (22,))
 
     event = client_channel.recv()
-    assert event.args == [22]
+    assert list(event.args) == [22]
     assert event.name == 'test'
 
     server_events.close()
diff --git a/tests/test_events.py b/tests/test_events.py
@@ -73,7 +73,7 @@ def test_event():
 
     assert unpacked.name == 'mylittleevent4'
     assert unpacked.header['message_id'] == 3
-    assert unpacked.args == ['b', 21]
+    assert list(unpacked.args) == ['b', 21]
 
     event = zerorpc.Event('mylittleevent5', ('c', 24, True),
             header={'lol': 'rofl'}, context=None)
@@ -104,7 +104,7 @@ def test_events_req_rep():
     event = server.recv()
     print event
     assert event.name == 'myevent'
-    assert event.args == ['arg1']
+    assert list(event.args) == ['arg1']
 
 
 def test_events_req_rep2():
@@ -120,13 +120,13 @@ def test_events_req_rep2():
         event = server.recv()
         print event
         assert event.name == 'myevent' + str(i)
-        assert event.args == [i]
+        assert list(event.args) == [i]
 
         server.emit('answser' + str(i * 2), (i * 2,))
         event = client.recv()
         print event
         assert event.name == 'answser' + str(i * 2)
-        assert event.args == [i * 2]
+        assert list(event.args) == [i * 2]
 
 
 def test_events_dealer_router():
@@ -142,14 +142,14 @@ def test_events_dealer_router():
         event = server.recv()
         print event
         assert event.name == 'myevent' + str(i)
-        assert event.args == [i]
+        assert list(event.args) == [i]
 
         server.emit('answser' + str(i * 2), (i * 2,),
                 xheader=dict(zmqid=event.header['zmqid']))
         event = client.recv()
         print event
         assert event.name == 'answser' + str(i * 2)
-        assert event.args == [i * 2]
+        assert list(event.args) == [i * 2]
 
 
 def test_events_push_pull():
@@ -167,4 +167,4 @@ def test_events_push_pull():
         event = server.recv()
         print event
         assert event.name == 'myevent'
-        assert event.args == [x]
+        assert list(event.args) == [x]
diff --git a/tests/test_heartbeat.py b/tests/test_heartbeat.py
@@ -169,7 +169,7 @@ def client_do():
             client_hbchan.emit('add', (x, x * x))
             event = client_hbchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_hbchan.close()
 
     client_task = gevent.spawn(client_do)
@@ -207,7 +207,7 @@ def client_do():
             client_hbchan.emit('add', (x, x * x))
             event = client_hbchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_hbchan.emit('add', (x, x * x))
         with assert_raises(zerorpc.LostRemote):
             event = client_hbchan.recv()
@@ -251,7 +251,7 @@ def client_do():
             client_hbchan.emit('add', (x, x * x))
             event = client_hbchan.recv()
             assert event.name == 'OK'
-            assert event.args == [x + x * x]
+            assert list(event.args) == [x + x * x]
         client_hbchan.close()
 
     client_task = gevent.spawn(client_do)
@@ -297,7 +297,7 @@ def client_do():
                 client_hbchan.emit('sleep', (x,))
                 event = client_hbchan.recv(timeout=3)
                 assert event.name == 'OK'
-                assert event.args == [x]
+                assert list(event.args) == [x]
         client_hbchan.close()
 
     client_task = gevent.spawn(client_do)
diff --git a/tests/test_reqstream.py b/tests/test_reqstream.py
@@ -50,7 +50,7 @@ def xrange(self, max):
     client.connect(endpoint)
 
     r = client.range(10)
-    assert r == list(range(10))
+    assert list(r) == list(range(10))
 
     r = client.xrange(10)
     assert getattr(r, 'next', None) is not None
diff --git a/tests/test_server.py b/tests/test_server.py
@@ -53,13 +53,13 @@ def add(self, a, b):
     client_channel = client.channel()
     client_channel.emit('lolita', tuple())
     event = client_channel.recv()
-    assert event.args == [42]
+    assert list(event.args) == [42]
     client_channel.close()
 
     client_channel = client.channel()
     client_channel.emit('add', (1, 2))
     event = client_channel.recv()
-    assert event.args == [3]
+    assert list(event.args) == [3]
     client_channel.close()
     srv.stop()
 
diff --git a/tests/test_wrapped_events.py b/tests/test_wrapped_events.py
@@ -47,7 +47,7 @@ def test_sub_events():
 
     event = server.recv()
     print event
-    assert type(event.args) is list
+    assert isinstance(event.args, (list, tuple))
     assert event.name == 'w'
     subevent = event.args
     print 'subevent:', subevent
@@ -86,7 +86,7 @@ def emitstuff():
 
     event = server.recv()
     print event
-    assert type(event.args) is list
+    assert isinstance(event.args, (list, tuple))
     assert event.name == 'w'
     subevent = event.args
     print 'subevent:', subevent
@@ -99,7 +99,7 @@ def emitstuff():
 
     event = server.recv()
     print event
-    assert type(event.args) is list
+    assert isinstance(event.args, (list, tuple))
     assert event.name == 'w'
     subevent = event.args
     print 'subevent:', subevent
