From cc2f4508d4b8bc5146611eaa0290e7dbe2fdf00f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 11 Aug 2014 16:34:44 -0400 Subject: upstream import --- zmq/tests/test_monitor.py | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'zmq/tests/test_monitor.py') 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) -- cgit v1.2.3