openstack/deb-python-eventlet
Code Issues Proposed changes

Yessss....test from rfk. TYVM Fixes #76.

Browse Source
This commit is contained in:
Ryan Williams
2011-01-28 23:15:13 -08:00
parent f443bf514b
commit 8c808e9184
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eventlet/green/zmq.py
View File

@@ -71,7 +71,7 @@ class Socket(__zmq__.Socket):
def _send_message(self, msg, flags=0): def _send_message(self, msg, flags=0):
if flags & __zmq__.NOBLOCK: if flags & __zmq__.NOBLOCK:
super(Socket,self)._send_message(msg, flags) super(Socket, self)._send_message(msg, flags)
return return
flags |= __zmq__.NOBLOCK flags |= __zmq__.NOBLOCK
while True: while True:
@@ -85,7 +85,7 @@ class Socket(__zmq__.Socket):
def _send_copy(self, msg, flags=0): def _send_copy(self, msg, flags=0):
if flags & __zmq__.NOBLOCK: if flags & __zmq__.NOBLOCK:
super(Socket,self)._send_copy(msg, flags) super(Socket, self)._send_copy(msg, flags)
return return
flags |= __zmq__.NOBLOCK flags |= __zmq__.NOBLOCK
while True: while True:
@@ -99,7 +99,7 @@ class Socket(__zmq__.Socket):
def _recv_message(self, flags=0, track=False): def _recv_message(self, flags=0, track=False):
if flags & __zmq__.NOBLOCK: if flags & __zmq__.NOBLOCK:
return super(Socket,self)._recv_message(flags) return super(Socket, self)._recv_message(flags, track)
flags |= __zmq__.NOBLOCK flags |= __zmq__.NOBLOCK
while True: while True:
try: try:
@@ -113,7 +113,7 @@ class Socket(__zmq__.Socket):
def _recv_copy(self, flags=0): def _recv_copy(self, flags=0):
if flags & __zmq__.NOBLOCK: if flags & __zmq__.NOBLOCK:
return super(Socket,self)._recv_copy(flags) return super(Socket, self)._recv_copy(flags)
flags |= __zmq__.NOBLOCK flags |= __zmq__.NOBLOCK
while True: while True:
try: try:

7
tests/zmq_test.py
View File

@@ -228,6 +228,13 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
# but it's private __str__ appears to be the way to go # but it's private __str__ appears to be the way to go
self.assertEqual([str(m) for m in recieved_msg], msg2) self.assertEqual([str(m) for m in recieved_msg], msg2)
@skip_unless_zmq
def test_recv_noblock_bug76(self):
req, rep, port = self.create_bound_pair(zmq.REQ, zmq.REP)
self.assertRaisesErrno(zmq.EAGAIN, rep.recv, zmq.NOBLOCK)
self.assertRaisesErrno(zmq.EAGAIN, rep.recv, zmq.NOBLOCK, True)
class TestThreadedContextAccess(TestCase): class TestThreadedContextAccess(TestCase):
"""zmq's Context must be unique within a hub """zmq's Context must be unique within a hub