[CalendarServer-changes] [11851] CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/ test_upgrade.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Mar 12 11:24:48 PDT 2014


Revision: 11851
          http://trac.calendarserver.org//changeset/11851
Author:   sagen at apple.com
Date:     2013-10-30 13:43:02 -0700 (Wed, 30 Oct 2013)
Log Message:
-----------
Update test to look for raising of NotAllowedToUpgrade

Modified Paths:
--------------
    CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py

Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py
===================================================================
--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2013-10-30 20:29:31 UTC (rev 11850)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade.py	2013-10-30 20:43:02 UTC (rev 11851)
@@ -25,8 +25,8 @@
 from twisted.trial.unittest import TestCase
 from txdav.common.datastore.sql_dump import dumpSchema
 from txdav.common.datastore.test.util import theStoreBuilder, StubNotifierFactory
-from txdav.common.datastore.upgrade.sql.upgrade import UpgradeDatabaseSchemaStep, \
-    UpgradeDatabaseAddressBookDataStep, UpgradeDatabaseCalendarDataStep
+from txdav.common.datastore.upgrade.sql.upgrade import (
+    UpgradeDatabaseSchemaStep, UpgradeDatabaseAddressBookDataStep, UpgradeDatabaseCalendarDataStep, NotAllowedToUpgrade )
 import re
 
 class SchemaUpgradeTests(TestCase):
@@ -215,12 +215,12 @@
         old_version = yield _loadVersion()
         try:
             yield upgrader.databaseUpgrade()
-        except RuntimeError:
+        except NotAllowedToUpgrade:
             pass
         except Exception:
-            self.fail("RuntimeError not raised")
+            self.fail("NotAllowedToUpgrade not raised")
         else:
-            self.fail("RuntimeError not raised")
+            self.fail("NotAllowedToUpgrade not raised")
         new_version = yield _loadVersion()
         yield _unloadOldSchema()
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/666c017d/attachment.html>


More information about the calendarserver-changes mailing list