Test GreenletIdent with Gevent enhanced Greenlets.

Author: A. Jesse Jiryu Davis

test/test_thread_util.py

@@ -26,7 +26,9 @@
 
 from pymongo import thread_util
 if thread_util.have_gevent:
- import greenlet
+ import greenlet # Plain greenlets.
+ import gevent.greenlet # Gevent's enhanced Greenlets.
+ import gevent.hub
 
 from test.utils import looplet, RendezvousThread
 
@@ -154,6 +156,42 @@ def test_greenlet_ident(self):
  self._test_ident(True)
 
 
+class TestGreenletIdent(unittest.TestCase):
+ def setUp(self):
+ if not thread_util.have_gevent:
+ raise SkipTest("need Gevent")
+
+ def test_unwatch_cleans_up(self):
+ # GreenletIdent.unwatch() should remove the on_thread_died callback
+ # from an enhanced Gevent Greenlet's list of links.
+ callback_ran = [False]
+
+ def on_greenlet_died(_):
+ callback_ran[0] = True
+
+ ident = thread_util.create_ident(use_greenlets=True)
+
+ def watch_and_unwatch():
+ ident.watch(on_greenlet_died)
+ ident.unwatch(ident.get())
+
+ g = gevent.greenlet.Greenlet(run=watch_and_unwatch)
+ g.start()
+ g.join(10)
+ the_hub = gevent.hub.get_hub()
+ if hasattr(the_hub, 'join'):
+ # Gevent 1.0
+ the_hub.join()
+ else:
+ # Gevent 0.13 and less
+ the_hub.shutdown()
+
+ self.assertTrue(g.successful())
+
+ # unwatch() canceled the callback.
+ self.assertFalse(callback_ran[0])
+
+
 # No functools in Python 2.4
 def my_partial(f, *args, **kwargs):
  def _f(*new_args, **new_kwargs):