[CalendarServer-changes] [12231] twext/trunk/twext/enterprise

[source_changes at macosforge.org]

Revision: 12231
          http://trac.calendarserver.org//changeset/12231
Author:   wsanchez at apple.com
Date:     2014-01-03 11:57:55 -0800 (Fri, 03 Jan 2014)
Log Message:
-----------
`ConnectionPool.__init__` should accept a `name` argument to initialize the service name

Fixes: #829
Author: exarkun

Modified Paths:
--------------
    twext/trunk/twext/enterprise/adbapi2.py
    twext/trunk/twext/enterprise/test/test_adbapi2.py

Modified: twext/trunk/twext/enterprise/adbapi2.py
===================================================================
--- twext/trunk/twext/enterprise/adbapi2.py	2014-01-03 19:44:15 UTC (rev 12230)
+++ twext/trunk/twext/enterprise/adbapi2.py	2014-01-03 19:57:55 UTC (rev 12231)
@@ -980,7 +980,8 @@
     def __init__(
         self,
         connectionFactory, maxConnections=10,
-        paramstyle=DEFAULT_PARAM_STYLE, dialect=DEFAULT_DIALECT
+        paramstyle=DEFAULT_PARAM_STYLE, dialect=DEFAULT_DIALECT,
+        name=None,
     ):
 
         super(ConnectionPool, self).__init__()
@@ -988,6 +989,8 @@
         self.maxConnections = maxConnections
         self.paramstyle = paramstyle
         self.dialect = dialect
+        if name is not None:
+            self.name = name
 
         self._free       = []
         self._busy       = []

Modified: twext/trunk/twext/enterprise/test/test_adbapi2.py
===================================================================
--- twext/trunk/twext/enterprise/test/test_adbapi2.py	2014-01-03 19:44:15 UTC (rev 12230)
+++ twext/trunk/twext/enterprise/test/test_adbapi2.py	2014-01-03 19:57:55 UTC (rev 12231)
@@ -152,6 +152,30 @@
 
 
 
+class ConnectionPoolNameTests(TestCase):
+    """
+    Tests for L{ConnectionPool}'s C{name} attribute.
+    """
+    def test_default(self):
+        """
+        If no value is given for the C{name} parameter to L{ConnectionPool}'s
+        initializer then L{ConnectionPool.name} is C{None}.
+        """
+        pool = ConnectionPool(None)
+        self.assertIs(None, pool.name)
+
+
+    def test_specified(self):
+        """
+        If a value is given for the C{name} parameter to L{ConnectionPool}'s
+        initializer then it is used as the value for L{ConnectionPool.name}.
+        """
+        name = "some test pool"
+        pool = ConnectionPool(None, name=name)
+        self.assertEqual(name, pool.name)
+
+
+
 class ConnectionPoolTests(ConnectionPoolHelper, TestCase, AssertResultHelper):
     """
     Tests for L{ConnectionPool}.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/e34bc209/attachment.html>