some more tests and a fix for issue where multiple connection instances were sharing a connection pool

Author: Mike Dirolf

pymongo/connection.py

@@ -68,12 +68,12 @@ class Pool(threading.local):
 
     # Non thread-locals
     __slots__ = ["sockets", "socket_factory"]
-    sockets = []
-
     sock = None
 
     def __init__(self, socket_factory):
         self.socket_factory = socket_factory
+        if not hasattr(self, "sockets"):
+            self.sockets = []
 
     def socket(self):
         # we store the pid here to avoid issues with fork /

test/test_pooling.py

@@ -21,6 +21,7 @@
 import sys
 sys.path[0:0] = [""]
 
+from pymongo.connection import Pool
 from test_connection import get_connection
 
 N = 50
@@ -93,6 +94,21 @@ def run_cases(ut, cases):
     for t in threads:
         t.join()
 
+
+class OneOp(threading.Thread):
+
+    def __init__(self, connection):
+        threading.Thread.__init__(self)
+        self.c = connection
+
+    def run(self):
+        assert len(self.c._Connection__pool.sockets) == 1
+        self.c.test.test.find_one()
+        assert len(self.c._Connection__pool.sockets) == 0
+        self.c.end_request()
+        assert len(self.c._Connection__pool.sockets) == 1
+
+
 class TestPooling(unittest.TestCase):
 
     def setUp(self):
@@ -109,6 +125,33 @@ def test_no_disconnect(self):
     def test_disconnect(self):
         run_cases(self, [SaveAndFind, Disconnect, Unique])
 
+    def test_independent_pools(self):
+        p = Pool(None)
+        self.assertEqual([], p.sockets)
+        self.c.end_request()
+        self.assertEqual([], p.sockets)
+
+        # Sensical values aren't really important here
+        p1 = Pool(5)
+        self.assertEqual(None, p.socket_factory)
+        self.assertEqual(5, p1.socket_factory)
+
+    def test_dependent_pools(self):
+        c = get_connection()
+        self.assertEqual(0, len(c._Connection__pool.sockets))
+        c.test.test.find_one()
+        self.assertEqual(0, len(c._Connection__pool.sockets))
+        c.end_request()
+        self.assertEqual(1, len(c._Connection__pool.sockets))
+
+        t = OneOp(c)
+        t.start()
+        t.join()
+
+        self.assertEqual(1, len(c._Connection__pool.sockets))
+        c.test.test.find_one()
+        self.assertEqual(0, len(c._Connection__pool.sockets))
+
 
 if __name__ == "__main__":
     unittest.main()