[CalendarServer-changes] [3717] CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/ test/test_upgrade.py
source_changes at macosforge.org
source_changes at macosforge.org
Mon Feb 23 16:55:27 PST 2009
Revision: 3717
http://trac.macosforge.org/projects/calendarserver/changeset/3717
Author: sagen at apple.com
Date: 2009-02-23 16:55:26 -0800 (Mon, 23 Feb 2009)
Log Message:
-----------
Get test_upgrade.py to pass again
Modified Paths:
--------------
CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py
Modified: CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py 2009-02-24 00:25:25 UTC (rev 3716)
+++ CalendarServer/branches/users/sagen/migration-3709/twistedcaldav/test/test_upgrade.py 2009-02-24 00:55:26 UTC (rev 3717)
@@ -17,7 +17,7 @@
from twistedcaldav.config import config
from twistedcaldav.directory.calendaruserproxy import CalendarUserProxyDatabase
from twistedcaldav.upgrade import UpgradeError
-from twistedcaldav.upgrade import UpgradeTheServer
+from twistedcaldav.upgrade import upgradeData
from twistedcaldav.test.util import TestCase
import os
@@ -25,6 +25,10 @@
class ProxyDBUpgradeTests(TestCase):
def setUpInitialStates(self):
+
+ xmlFile = os.path.join(os.path.dirname(os.path.dirname(__file__)),
+ "directory", "test", "accounts.xml")
+ config.DirectoryService.params.xmlFile = xmlFile
self.setUpOldDocRoot()
self.setUpOldDocRootWithoutDB()
@@ -104,6 +108,7 @@
config.DocumentRoot = self.olddocroot
config.DataRoot = self.newdataroot
+
# Check pre-conditions
self.assertTrue(os.path.exists(os.path.join(config.DocumentRoot, "principals")))
@@ -111,7 +116,7 @@
self.assertTrue(os.path.exists(os.path.join(config.DocumentRoot, "principals", CalendarUserProxyDatabase.dbOldFilename)))
self.assertFalse(os.path.exists(os.path.join(config.DataRoot, CalendarUserProxyDatabase.dbFilename)))
- UpgradeTheServer.doUpgrade()
+ upgradeData(config)
# Check post-conditions
self.assertFalse(os.path.exists(os.path.join(config.DocumentRoot, "principals",)))
@@ -133,7 +138,7 @@
self.assertFalse(os.path.exists(os.path.join(config.DocumentRoot, "principals", CalendarUserProxyDatabase.dbOldFilename)))
self.assertFalse(os.path.exists(os.path.join(config.DataRoot, CalendarUserProxyDatabase.dbFilename)))
- UpgradeTheServer.doUpgrade()
+ upgradeData(config)
# Check post-conditions
self.assertFalse(os.path.exists(os.path.join(config.DocumentRoot, "principals",)))
@@ -153,7 +158,7 @@
self.assertFalse(os.path.exists(os.path.join(config.DocumentRoot, "principals")))
self.assertTrue(os.path.exists(os.path.join(config.DataRoot, CalendarUserProxyDatabase.dbFilename)))
- UpgradeTheServer.doUpgrade()
+ upgradeData(config)
# Check post-conditions
self.assertFalse(os.path.exists(os.path.join(config.DocumentRoot, "principals",)))
@@ -175,11 +180,11 @@
self.assertTrue(os.path.exists(os.path.join(config.DocumentRoot, "principals", CalendarUserProxyDatabase.dbOldFilename)))
self.assertTrue(os.path.exists(os.path.join(config.DataRoot, CalendarUserProxyDatabase.dbFilename)))
- self.assertRaises(UpgradeError, UpgradeTheServer.doUpgrade)
+ self.assertRaises(UpgradeError, upgradeData, config)
# Check post-conditions
self.assertTrue(os.path.exists(os.path.join(config.DocumentRoot, "principals")))
self.assertTrue(os.path.isdir(os.path.join(config.DocumentRoot, "principals")))
self.assertTrue(os.path.exists(os.path.join(config.DocumentRoot, "principals", CalendarUserProxyDatabase.dbOldFilename)))
self.assertTrue(os.path.exists(os.path.join(config.DataRoot, CalendarUserProxyDatabase.dbFilename)))
-
\ No newline at end of file
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090223/a4a2a00a/attachment-0001.html>
More information about the calendarserver-changes
mailing list