From b378280ff0df0bddc4ff0c21d0671c0e6eedc6dd Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Tue, 16 Feb 2010 20:24:24 -0800
Subject: [PATCH] Disabling pyevent-problematic tests.

---
 tests/__init__.py                 |  7 ++++---
 tests/stdlib/test_socketserver.py | 12 ++++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/__init__.py b/tests/__init__.py
index ea2460c..5102c34 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -70,12 +70,13 @@ def requires_twisted(func):
             return False
     return skip_unless(requirement)(func)
     
+
+def using_pyevent(_f):
+    from eventlet.hubs import get_hub
+    return 'pyevent' in type(get_hub()).__module__
     
 def skip_with_pyevent(func):
     """ Decorator that skips a test if we're using the pyevent hub."""
-    def using_pyevent(_f):
-        from eventlet.hubs import get_hub
-        return 'pyevent' in type(get_hub()).__module__
     return skip_if(using_pyevent)(func)
 
 
diff --git a/tests/stdlib/test_socketserver.py b/tests/stdlib/test_socketserver.py
index f760ba4..e7531c1 100644
--- a/tests/stdlib/test_socketserver.py
+++ b/tests/stdlib/test_socketserver.py
@@ -20,10 +20,14 @@ patcher.inject('test.test_socketserver',
     ('threading', threading))
 
 # only a problem with pyevent
-try:
-    SocketServerTest.test_ForkingUDPServer = lambda *a, **kw: None
-except (NameError, AttributeError):
-    pass
+from eventlet import tests
+if tests.using_pyevent():
+    try:
+        SocketServerTest.test_ForkingUDPServer = lambda *a, **kw: None
+        SocketServerTest.test_ForkingTCPServer = lambda *a, **kw: None
+        SocketServerTest.test_ForkingUnixStreamServer = lambda *a, **kw: None
+    except (NameError, AttributeError):
+        pass
 
 if __name__ == "__main__":
     test_main()