openstack/deb-python-eventlet
Code Issues Proposed changes

Took sleep statements out of send/recv functions. Renamed tests to zmq_tests

Browse Source
This commit is contained in:
Ben Ford
2010-09-24 07:56:52 +01:00
parent 77673057cc
commit 0d4f448500
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eventlet/green/zmq.py
View File

@@ -23,7 +23,6 @@ class Socket(__zmq__.Socket):
while True: while True:
try: try:
super(Socket, self)._send_message(data, flags) super(Socket, self)._send_message(data, flags)
sleep()
return return
except __zmq__.ZMQError, e: except __zmq__.ZMQError, e:
if e.errno != EAGAIN: if e.errno != EAGAIN:
@@ -35,7 +34,6 @@ class Socket(__zmq__.Socket):
while True: while True:
try: try:
super(Socket, self)._send_copy(data, flags) super(Socket, self)._send_copy(data, flags)
sleep()
return return
except __zmq__.ZMQError, e: except __zmq__.ZMQError, e:
if e.errno != EAGAIN: if e.errno != EAGAIN:

16
tests/zeromq_test.py → tests/zmq_test.py
View File

@@ -37,7 +37,6 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
@skip_unless_zmq @skip_unless_zmq
def test_recv_spawned_before_send_is_non_blocking(self): def test_recv_spawned_before_send_is_non_blocking(self):
ipc = 'ipc:///tmp/tests'
req, rep = self.create_bound_pair(zmq.PAIR, zmq.PAIR) req, rep = self.create_bound_pair(zmq.PAIR, zmq.PAIR)
# req.connect(ipc) # req.connect(ipc)
# rep.bind(ipc) # rep.bind(ipc)
@@ -52,6 +51,14 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
done.wait() done.wait()
self.assertEqual(msg['res'], 'test') self.assertEqual(msg['res'], 'test')
@skip_unless_zmq
def test_close_socket_raises_enotsup(self):
req, rep = self.create_bound_pair(zmq.PAIR, zmq.PAIR)
rep.close()
req.close()
self.assertRaisesErrno(zmq.ENOTSUP, rep.recv)
self.assertRaisesErrno(zmq.ENOTSUP, req.send, 'test')
@skip_unless_zmq @skip_unless_zmq
def test_send_1k_req_rep(self): def test_send_1k_req_rep(self):
req, rep = self.create_bound_pair(zmq.REQ, zmq.REP) req, rep = self.create_bound_pair(zmq.REQ, zmq.REP)
@@ -68,6 +75,7 @@ got '%s'" % (zmq.ZMQError(errno), zmq.ZMQError(e.errno)))
rx_i = rep.recv() rx_i = rep.recv()
if rx_i == "1000": if rx_i == "1000":
rep.send('done') rep.send('done')
sleep()
done.send(0) done.send(0)
break break
rep.send('i') rep.send('i')
@@ -128,7 +136,11 @@ class TestThreadedContextAccess(TestCase):
test_result = [] test_result = []
def assert_different(ctx): def assert_different(ctx):
assert not hasattr(_threadlocal, 'hub') assert not hasattr(_threadlocal, 'hub')
this_thread_context = get_hub().get_context() hub = get_hub()
try:
this_thread_context = hub.get_context()
except:
test_result.append('fail')
test_result.append(ctx is this_thread_context) test_result.append(ctx is this_thread_context)
Thread(target=assert_different, args=(context,)).start() Thread(target=assert_different, args=(context,)).start()
while not len(test_result): while not len(test_result):