Don't use multiprocessing in tests on Windows

A. Jesse Jiryu Davis · A. Jesse Jiryu Davis · commit ddbc8464f3c5 · 2012-04-06T13:34:23.000-04:00
diff --git a/test/test_gevent.py b/test/test_gevent.py
@@ -15,6 +15,7 @@
 """Tests for connection-pooling with greenlets and Gevent"""
 
 import os
+import socket
 import time
 import threading
 import unittest
@@ -25,9 +26,11 @@
 from test.test_connection import get_connection
 from test.utils import delay, force_reclaim_sockets
 
+
 host = os.environ.get("DB_IP", "localhost")
 port = int(os.environ.get("DB_PORT", 27017))
 
+
 def looplet(greenlets):
     """World's smallest event loop; run until all greenlets are done
     """
@@ -55,39 +58,23 @@ def _test_pool(self, use_greenlets, use_request):
         gr1: get results
         gr0: get results
         """
-        NOT_STARTED = 0
-        SUCCESS = 1
-        SKIP = 2
+        if use_greenlets:
+            try:
+                from gevent import monkey, Greenlet
+            except ImportError:
+                raise SkipTest('gevent not installed')
+
+            # Note we don't do patch_thread() or patch_all() - we're
+            # testing here that patch_thread() is unnecessary for
+            # the connection pool to work properly.
+            monkey.patch_socket()
 
         try:
-            from multiprocessing import Value, Process
-        except ImportError:
-            # Python < 2.6
-            raise SkipTest('No multiprocessing module')
-        
-        outcome = Value('i', NOT_STARTED)
-
-        results = {
-            'find_fast_result': None,
-            'find_slow_result': None,
-        }
-
-        # Do test in separate process so patch_socket() doesn't affect all
-        # subsequent unittests
-        def do_test():
-            if use_greenlets:
-                try:
-                    from gevent import Greenlet
-                    from gevent import monkey
-
-                    # Note we don't do patch_thread() or patch_all() - we're
-                    # testing here that patch_thread() is unnecessary for
-                    # the connection pool to work properly.
-                    monkey.patch_socket()
-                except ImportError:
-                    outcome.value = SKIP
-                    return
-    
+            results = {
+                'find_fast_result': None,
+                'find_slow_result': None,
+            }
+
             cx = get_connection(
                 use_greenlets=use_greenlets,
                 auto_start_request=False
@@ -120,8 +107,8 @@ def find_slow():
 
                 history.append('find_slow start')
 
-                # Javascript function that pauses for half a second
-                where = delay(0.5)
+                # Javascript function that pauses
+                where = delay(2)
                 results['find_slow_result'] = list(db.test.find(
                     {'$where': where}
                 ))
@@ -139,7 +126,7 @@ def find_slow():
                 gr0 = threading.Thread(target=find_slow)
                 gr1 = threading.Thread(target=find_fast)
                 gr0.start()
-                time.sleep(0.1)
+                time.sleep(.1)
                 gr1.start()
 
             gr0.join()
@@ -157,20 +144,9 @@ def find_slow():
                 'find_slow done',
             ], history)
 
-            outcome.value = SUCCESS
-
-        proc = Process(target=do_test)
-        proc.start()
-        proc.join()
-
-        if outcome.value == SKIP:
-            raise SkipTest('gevent not installed')
-
-        self.assertEqual(
-            SUCCESS,
-            outcome.value,
-            'test failed'
-        )
+        finally:
+            # Undo Gevent patching
+            reload(socket)
 
     def test_threads_pool(self):
         # Test the same sequence of calls as the gevent tests to ensure my test
diff --git a/test/test_pooling.py b/test/test_pooling.py
@@ -388,6 +388,9 @@ def loop(pipe):
                          a._Connection__pool.get_socket((a.host, a.port)))
 
     def test_request_with_fork(self):
+        if sys.platform == "win32":
+            raise SkipTest("Can't test forking on Windows")
+
         try:
             from multiprocessing import Process, Pipe
         except ImportError:
