diff options
| author | Micah Anderson <micah@riseup.net> | 2014-08-11 16:34:44 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2014-08-11 16:34:44 -0400 |
| commit | cc2f4508d4b8bc5146611eaa0290e7dbe2fdf00f (patch) | |
| tree | 0365c18dae4919ba9d3854982336ec1425f265c7 /zmq/tests | |
| parent | cce638a8adf4e045ca5505afea4bda57753c31dd (diff) | |
upstream importupstream/14.3.1
Diffstat (limited to 'zmq/tests')
| -rw-r--r-- | zmq/tests/test_message.py | 6 | ||||
| -rw-r--r-- | zmq/tests/test_monitor.py | 19 |
2 files changed, 12 insertions, 13 deletions
diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py index 5e9b58c..d8770bd 100644 --- a/zmq/tests/test_message.py +++ b/zmq/tests/test_message.py @@ -324,8 +324,10 @@ class TestFrame(BaseZMQTestCase): for i in range(1,len(shapes)+1): shape = shapes[:i] for dt in dtypes: - A = numpy.random.uniform(-10000000, - 1000000, size=shape).astype(dt) + A = numpy.empty(shape, dtype=dt) + while numpy.isnan(A).any(): + # don't let nan sneak in + A = numpy.ndarray(shape, dtype=dt) a.send(A, copy=False) msg = b.recv(copy=False) diff --git a/zmq/tests/test_monitor.py b/zmq/tests/test_monitor.py index ab02b68..d47e23f 100644 --- a/zmq/tests/test_monitor.py +++ b/zmq/tests/test_monitor.py @@ -35,13 +35,11 @@ class TestSocketMonitor(BaseZMQTestCase): # test receive event for connect event s_rep.connect("tcp://127.0.0.1:6666") m = recv_monitor_message(s_event) - if m['event'] == zmq.EVENT_CONNECT_DELAYED: - self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666") - # test receive event for connected event - m = recv_monitor_message(s_event) - self.assertEqual(m['event'], zmq.EVENT_CONNECTED) + self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED) self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666") - + # test receive event for connected event + m = recv_monitor_message(s_event) + self.assertEqual(m['event'], zmq.EVENT_CONNECTED) @skip_lt_4 def test_monitor_connected(self): @@ -58,9 +56,8 @@ class TestSocketMonitor(BaseZMQTestCase): # test receive event for connect event s_rep.connect("tcp://127.0.0.1:6667") m = recv_monitor_message(s_event) - if m['event'] == zmq.EVENT_CONNECT_DELAYED: - self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667") - # test receive event for connected event - m = recv_monitor_message(s_event) - self.assertEqual(m['event'], zmq.EVENT_CONNECTED) + self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED) self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667") + # test receive event for connected event + m = recv_monitor_message(s_event) + self.assertEqual(m['event'], zmq.EVENT_CONNECTED) |