[CalendarServer-changes] [9718] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 9718
          http://trac.macosforge.org/projects/calendarserver/changeset/9718
Author:   glyph at apple.com
Date:     2012-08-16 14:49:54 -0700 (Thu, 16 Aug 2012)
Log Message:
-----------
Add upcall for stopService as well.

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

Property Changed:
----------------
    CalendarServer/trunk/

Modified: CalendarServer/trunk/twext/enterprise/adbapi2.py
===================================================================
--- CalendarServer/trunk/twext/enterprise/adbapi2.py	2012-08-16 21:49:53 UTC (rev 9717)
+++ CalendarServer/trunk/twext/enterprise/adbapi2.py	2012-08-16 21:49:54 UTC (rev 9718)
@@ -936,6 +936,7 @@
         Forcibly abort any outstanding transactions, and release all resources
         (notably, threads).
         """
+        super(ConnectionPool, self).stopService()
         self._stopping = True
 
         # Phase 1: Cancel any transactions that are waiting so they won't try to

Modified: CalendarServer/trunk/twext/enterprise/test/test_adbapi2.py
===================================================================
--- CalendarServer/trunk/twext/enterprise/test/test_adbapi2.py	2012-08-16 21:49:53 UTC (rev 9717)
+++ CalendarServer/trunk/twext/enterprise/test/test_adbapi2.py	2012-08-16 21:49:54 UTC (rev 9718)
@@ -632,6 +632,7 @@
         self.assertEquals(holder.started, True)
         self.assertEquals(holder.stopped, False)
         self.pool.stopService()
+        self.assertEquals(self.pool.running, False)
         self.assertEquals(len(self.holders), 1)
         self.assertEquals(holder.started, True)
         self.assertEquals(holder.stopped, True)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120816/99a0a5a2/attachment.html>