[CalendarServer-changes] [5821] CalendarServer/branches/new-store/txcaldav/calendarstore/test/ test_file.py
source_changes at macosforge.org
source_changes at macosforge.org
Wed Jun 30 15:38:49 PDT 2010
Revision: 5821
http://trac.macosforge.org/projects/calendarserver/changeset/5821
Author: glyph at apple.com
Date: 2010-06-30 15:38:49 -0700 (Wed, 30 Jun 2010)
Log Message:
-----------
update fixture generation to use new paths
Modified Paths:
--------------
CalendarServer/branches/new-store/txcaldav/calendarstore/test/test_file.py
Modified: CalendarServer/branches/new-store/txcaldav/calendarstore/test/test_file.py
===================================================================
--- CalendarServer/branches/new-store/txcaldav/calendarstore/test/test_file.py 2010-06-30 22:38:19 UTC (rev 5820)
+++ CalendarServer/branches/new-store/txcaldav/calendarstore/test/test_file.py 2010-06-30 22:38:49 UTC (rev 5821)
@@ -52,11 +52,12 @@
test.root = FilePath(test.mktemp())
test.root.createDirectory()
- calendarPath = test.calendarPath = test.root.child("store")
+ storeRootPath = test.storeRootPath = test.root.child("store")
+ calendarPath = storeRootPath.child("calendars").child("__uids__")
+ calendarPath.parent().makedirs()
storePath.copyTo(calendarPath)
-
- test.calendarStore = CalendarStore(calendarPath)
+ test.calendarStore = CalendarStore(storeRootPath)
test.txn = test.calendarStore.newTransaction()
assert test.calendarStore is not None, "No calendar store?"
@@ -426,7 +427,7 @@
-class FileStorageTests(unittest.TestCase, CommonTests):
+class FileStorageTests(CommonTests, unittest.TestCase):
"""
File storage tests.
"""
@@ -445,7 +446,7 @@
constructor argument.
"""
self.assertEquals(self.storeUnderTest()._path,
- self.calendarPath)
+ self.storeRootPath)
def test_calendarObjectsWithDotFile(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100630/14f0ce9d/attachment.html>
More information about the calendarserver-changes
mailing list