[CalendarServer-changes] [8109] CalendarServer/trunk/txdav/common/datastore

[source_changes at macosforge.org]

Revision: 8109
          http://trac.macosforge.org/projects/calendarserver/changeset/8109
Author:   cdaboo at apple.com
Date:     2011-09-20 12:43:00 -0700 (Tue, 20 Sep 2011)
Log Message:
-----------
Tweaks.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/test/test_util.py
    CalendarServer/trunk/txdav/common/datastore/util.py

Modified: CalendarServer/trunk/txdav/common/datastore/test/test_util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/test/test_util.py	2011-09-20 19:07:10 UTC (rev 8108)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_util.py	2011-09-20 19:43:00 UTC (rev 8109)
@@ -340,16 +340,22 @@
             yield startTxn.execSQL("drop schema test_dbUpgrades cascade;")
             yield startTxn.commit()
 
+        @inlineCallbacks
+        def _cleanupOldSchema():
+            startTxn = store.newTransaction("test_dbUpgrades")        
+            yield startTxn.execSQL("set search_path to public;")
+            yield startTxn.execSQL("drop schema if exists test_dbUpgrades cascade;")
+            yield startTxn.commit()
+
+        self.addCleanup(_cleanupOldSchema)
+
         test_upgrader = UpgradeDatabaseSchemaService(None, None)
         expected_version = self._getSchemaVersion(test_upgrader.schemaLocation.child("current.sql"))
         for child in test_upgrader.schemaLocation.child("old").globChildren("*.sql"):
-            try:
-                upgrader = UpgradeDatabaseSchemaService(store, None)
-                yield _loadOldSchema(child)
-                yield upgrader.doUpgrade()
-                new_version = yield _loadVersion()
-                yield _unloadOldSchema()
-            except Exception, e:
-                self.fail("Upgrade from %s failed with %s" % (child.basename(), str(e),))
+            upgrader = UpgradeDatabaseSchemaService(store, None)
+            yield _loadOldSchema(child)
+            yield upgrader.doUpgrade()
+            new_version = yield _loadVersion()
+            yield _unloadOldSchema()
 
             self.assertEqual(new_version, expected_version)

Modified: CalendarServer/trunk/txdav/common/datastore/util.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/util.py	2011-09-20 19:07:10 UTC (rev 8108)
+++ CalendarServer/trunk/txdav/common/datastore/util.py	2011-09-20 19:43:00 UTC (rev 8109)
@@ -228,6 +228,9 @@
     def __init__(self, sqlStore, service, uid=None, gid=None):
         """
         Initialize the service.
+        
+        @param sqlStore: The store to operate on. Can be C{None} when doing unit tests.
+        @param service:  Wrapped service. Can be C{None} when doing unit tests.
         """
         self.wrappedService = service
         self.sqlStore = sqlStore
@@ -282,7 +285,7 @@
             "Database schema check complete, launching database service."
         )
         # see http://twistedmatrix.com/trac/ticket/4649
-        if self.wrappedService:
+        if self.wrappedService is not None:
             reactor.callLater(0, self.wrappedService.setServiceParent, self.parent)
 
     @inlineCallbacks
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110920/f80eb0af/attachment-0001.html>