[Python-modules-commits] r29368 - in packages/pyzmq/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, June 17, 2014 @ 21:35:19
  Author: jtaylor-guest
Revision: 29368

monitor-test.patch: fix test logic for delayless connects on freebsd

Added:
  packages/pyzmq/trunk/debian/patches/monitor-test.patch
Modified:
  packages/pyzmq/trunk/debian/changelog
  packages/pyzmq/trunk/debian/patches/series

Modified: packages/pyzmq/trunk/debian/changelog
===================================================================
--- packages/pyzmq/trunk/debian/changelog	2014-06-17 21:35:13 UTC (rev 29367)
+++ packages/pyzmq/trunk/debian/changelog	2014-06-17 21:35:19 UTC (rev 29368)
@@ -1,6 +1,7 @@
 pyzmq (14.3.1-1) unstable; urgency=medium
 
   * New upstream release
+  * monitor-test.patch: fix test logic for delayless connects on freebsd
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 17 Jun 2014 23:23:35 +0200
 

Added: packages/pyzmq/trunk/debian/patches/monitor-test.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/monitor-test.patch	                        (rev 0)
+++ packages/pyzmq/trunk/debian/patches/monitor-test.patch	2014-06-17 21:35:19 UTC (rev 29368)
@@ -0,0 +1,38 @@
+Description: handle freebsd connecting without delay
+Bug: https://github.com/zeromq/pyzmq/pull/558
+--- a/zmq/tests/test_monitor.py
++++ b/zmq/tests/test_monitor.py
+@@ -35,11 +35,13 @@ class TestSocketMonitor(BaseZMQTestCase):
+         # test receive event for connect event
+         s_rep.connect("tcp://127.0.0.1:6666")
+         m = recv_monitor_message(s_event)
+-        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)
++        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['endpoint'], b"tcp://127.0.0.1:6666")
++
+ 
+     @skip_lt_4
+     def test_monitor_connected(self):
+@@ -56,8 +58,9 @@ class TestSocketMonitor(BaseZMQTestCase):
+         # test receive event for connect event
+         s_rep.connect("tcp://127.0.0.1:6667")
+         m = recv_monitor_message(s_event)
+-        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)
++        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['endpoint'], b"tcp://127.0.0.1:6667")
+
+

Modified: packages/pyzmq/trunk/debian/patches/series
===================================================================
--- packages/pyzmq/trunk/debian/patches/series	2014-06-17 21:35:13 UTC (rev 29367)
+++ packages/pyzmq/trunk/debian/patches/series	2014-06-17 21:35:19 UTC (rev 29368)
@@ -1,2 +1,3 @@
 noncopysend-test.patch
 cffi-fix.patch
+monitor-test.patch