update tests after Event's fix

greentest/test__event.py

@@ -14,6 +14,10 @@ class TestAsyncResultWait(greentest.GenericWaitTestCase):
     def wait(self, timeout):
         AsyncResult().wait(timeout=timeout)
 
+class TestAsyncResultGet(greentest.GenericGetTestCase):
+
+    def wait(self, timeout):
+        AsyncResult().get(timeout=timeout)
 
 class TestAsyncResult(greentest.TestCase):
 
@@ -51,9 +55,9 @@ class TestAsyncResult(greentest.TestCase):
             g.kill(block=True)
 
 
-class TestLink_Signal(greentest.TestCase):
+class TestAsync_ResultAsLinkTarget(greentest.TestCase):
 
-    def test_put(self):
+    def test_set(self):
         g = gevent.spawn(lambda : 1)
         s1, s2, s3 = AsyncResult(), AsyncResult(), AsyncResult()
         g.link(s1)
@@ -63,7 +67,7 @@ class TestLink_Signal(greentest.TestCase):
         assert s2.get() == 1
         assert gevent.with_timeout(DELAY, s3.get, timeout_value=X) is X
 
-    def test_put_exception(self):
+    def test_set_exception(self):
         g = gevent.spawn(lambda : 1/0)
         s1, s2, s3 = AsyncResult(), AsyncResult(), AsyncResult()
         g.link(s1)

greentest/test__greenlet.py

@@ -66,17 +66,6 @@ class TestLink(greentest.TestCase):
         finally:
             receiver.kill(block=True)
 
-    def test_link_to_event(self):
-        p = gevent.spawn(lambda : 100)
-        event = Event()
-        p.link(event.set)
-        self.assertEqual(event.get().get(), 100)
-
-        for i in xrange(3):
-            event2 = Event()
-            p.link(event2.set)
-            self.assertEqual(event2.get().get(), 100)
-
     def test_link_to_asyncresult(self):
         p = gevent.spawn(lambda : 100)
         event = AsyncResult()
@@ -456,8 +445,8 @@ class TestStuff(greentest.TestCase):
         p = gevent.spawn(lambda : 5)
         self._test_multiple_listeners_error_unlink(p, p.rawlink)
 
-    def test_multiple_listeners_error_unlink_Event_rawlink(self):
-        e = Event()
+    def test_multiple_listeners_error_unlink_AsyncResult_rawlink(self):
+        e = AsyncResult()
         gevent.spawn(e.set, 6)
         self._test_multiple_listeners_error_unlink(e, e.rawlink)
 
@@ -512,6 +501,11 @@ class TestJoin(greentest.GenericWaitTestCase):
     def wait(self, timeout):
         gevent.spawn(gevent.sleep, 10).join(timeout=timeout)
 
+class TestGet(greentest.GenericGetTestCase):
+
+    def wait(self, timeout):
+        gevent.spawn(gevent.sleep, 10).get(timeout=timeout)
+
 class TestJoinAll(greentest.GenericWaitTestCase):
 
     def wait(self, timeout):

greentest/test__pool.py

@@ -14,7 +14,7 @@ class TestCoroutinePool(greentest.TestCase):
             done.set()
         pool = self.klass(2)
         pool.apply_async(some_work, ('x', ))
-        done.get()
+        done.wait()
 
     def test_apply(self):
         value = 'return value'
@@ -33,7 +33,7 @@ class TestCoroutinePool(greentest.TestCase):
 
         def consumer():
             results.append('cons1')
-            evt.get()
+            evt.wait()
             results.append('cons2')
 
         pool = self.klass(2)
@@ -64,10 +64,10 @@ class TestCoroutinePool(greentest.TestCase):
         evt = Event()
         def reenter_async():
             pool.apply_async(lambda a: a, ('reenter', ))
-            evt.set('done')
+            evt.set()
 
         pool.apply_async(reenter_async)
-        evt.get()
+        evt.wait()
 
     def test_stderr_raising(self):
         # testing that really egregious errors in the error handling code

greentest/test__queue.py

@@ -2,7 +2,7 @@ from greentest import TestCase, main
 import gevent
 from gevent import util, core
 from gevent import queue
-from gevent.event import Event
+from gevent.event import AsyncResult
 
 
 class TestQueue(TestCase):
@@ -62,8 +62,8 @@ class TestQueue(TestCase):
             x = q.get()
             evt.set(x)
 
-        e1 = Event()
-        e2 = Event()
+        e1 = AsyncResult()
+        e2 = AsyncResult()
 
         p1 = gevent.spawn(sender, e1, q)
         gevent.sleep(0.001)
@@ -85,7 +85,7 @@ class TestQueue(TestCase):
             evt.set(q.get())
 
         sendings = ['1', '2', '3', '4']
-        evts = [Event() for x in sendings]
+        evts = [AsyncResult() for x in sendings]
         for i, x in enumerate(sendings):
             gevent.spawn(waiter, q, evts[i]) # use waitall for them
 
@@ -121,7 +121,7 @@ class TestQueue(TestCase):
             except RuntimeError:
                 evt.set('timed out')
 
-        evt = Event()
+        evt = AsyncResult()
         gevent.spawn(do_receive, q, evt)
         self.assertEquals(evt.get(), 'timed out')
 
@@ -152,8 +152,8 @@ class TestQueue(TestCase):
                 timeout.cancel()
 
         q = queue.Queue()
-        dying_evt = Event()
-        waiting_evt = Event()
+        dying_evt = AsyncResult()
+        waiting_evt = AsyncResult()
         gevent.spawn(do_receive, q, dying_evt)
         gevent.spawn(waiter, q, waiting_evt)
         gevent.sleep(0)
@@ -172,8 +172,8 @@ class TestQueue(TestCase):
             # XXX finally = timeout
 
         q = queue.Queue()
-        e1 = Event()
-        e2 = Event()
+        e1 = AsyncResult()
+        e2 = AsyncResult()
         gevent.spawn(do_receive, q, e1)
         gevent.spawn(do_receive, q, e2)
         gevent.sleep(0)