Commit 62fedc49 authored by Denis Bilenko's avatar Denis Bilenko

use Event.set instead of Event.put in tests

parent ca09fc6f
......@@ -69,12 +69,12 @@ class TestLink(greentest.TestCase):
def test_link_to_event(self):
p = gevent.spawn(lambda : 100)
event = Event()
p.link(event.put)
p.link(event.set)
self.assertEqual(event.get().get(), 100)
for i in xrange(3):
event2 = Event()
p.link(event2.put)
p.link(event2.set)
self.assertEqual(event2.get().get(), 100)
def test_link_to_asyncresult(self):
......@@ -458,7 +458,7 @@ class TestStuff(greentest.TestCase):
def test_multiple_listeners_error_unlink_Event_rawlink(self):
e = Event()
gevent.spawn(e.put, 6)
gevent.spawn(e.set, 6)
self._test_multiple_listeners_error_unlink(e, e.rawlink)
def test_killing_unlinked(self):
......@@ -467,7 +467,7 @@ class TestStuff(greentest.TestCase):
try:
raise ExpectedError('test_killing_unlinked')
except:
e.put_exception(sys.exc_info()[1])
e.set_exception(sys.exc_info()[1])
p = gevent.spawn_link(func)
try:
try:
......
......@@ -11,7 +11,7 @@ class TestCoroutinePool(TestCase):
def test_apply_async(self):
done = Event()
def some_work(x):
done.put()
done.set()
pool = self.klass(2)
pool.apply_async(some_work, ('x', ))
done.get()
......@@ -29,7 +29,7 @@ class TestCoroutinePool(TestCase):
results = []
def producer():
results.append('prod')
evt.put()
evt.set()
def consumer():
results.append('cons1')
......@@ -64,7 +64,7 @@ class TestCoroutinePool(TestCase):
evt = Event()
def reenter_async():
pool.apply_async(lambda a: a, ('reenter', ))
evt.put('done')
evt.set('done')
pool.apply_async(reenter_async)
evt.get()
......
......@@ -56,11 +56,11 @@ class TestQueue(TestCase):
q = queue.Queue(0)
def sender(evt, q):
q.put('hi')
evt.put('done')
evt.set('done')
def receiver(evt, q):
x = q.get()
evt.put(x)
evt.set(x)
e1 = Event()
e2 = Event()
......@@ -82,7 +82,7 @@ class TestQueue(TestCase):
q = queue.Queue()
def waiter(q, evt):
evt.put(q.get())
evt.set(q.get())
sendings = ['1', '2', '3', '4']
evts = [Event() for x in sendings]
......@@ -117,9 +117,9 @@ class TestQueue(TestCase):
gevent.Timeout(0, RuntimeError())
try:
result = q.get()
evt.put(result)
evt.set(result)
except RuntimeError:
evt.put('timed out')
evt.set('timed out')
evt = Event()
gevent.spawn(do_receive, q, evt)
......@@ -139,15 +139,15 @@ class TestQueue(TestCase):
def test_two_waiters_one_dies(self):
def waiter(q, evt):
evt.put(q.get())
evt.set(q.get())
def do_receive(q, evt):
timeout = gevent.Timeout(0, RuntimeError())
try:
try:
result = q.get()
evt.put(result)
evt.set(result)
except RuntimeError:
evt.put('timed out')
evt.set('timed out')
finally:
timeout.cancel()
......@@ -166,9 +166,9 @@ class TestQueue(TestCase):
gevent.Timeout(0, RuntimeError())
try:
result = q.get()
evt.put(result)
evt.set(result)
except RuntimeError:
evt.put('timed out')
evt.set('timed out')
# XXX finally = timeout
q = queue.Queue()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment