[CalendarServer-changes] [6358] CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/ datastore/test
source_changes at macosforge.org
source_changes at macosforge.org
Thu Sep 23 14:28:49 PDT 2010
Revision: 6358
http://trac.macosforge.org/projects/calendarserver/changeset/6358
Author: glyph at apple.com
Date: 2010-09-23 14:28:48 -0700 (Thu, 23 Sep 2010)
Log Message:
-----------
all test unit-test callers of calendarWithName
Modified Paths:
--------------
CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/common.py
CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/test_sql.py
Modified: CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/common.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/common.py 2010-09-23 21:00:41 UTC (rev 6357)
+++ CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/common.py 2010-09-23 21:28:48 UTC (rev 6358)
@@ -181,19 +181,25 @@
return self.transactionUnderTest().calendarHomeWithUID("home1")
+ @inlineCallbacks
def calendarUnderTest(self):
"""
Get the calendar detailed by C{requirements['home1']['calendar_1']}.
"""
- return self.homeUnderTest().calendarWithName("calendar_1")
+ returnValue((yield
+ (yield self.homeUnderTest()).calendarWithName("calendar_1"))
+ )
+ @inlineCallbacks
def calendarObjectUnderTest(self):
"""
Get the calendar detailed by
C{requirements['home1']['calendar_1']['1.ics']}.
"""
- return self.calendarUnderTest().calendarObjectWithName("1.ics")
+ returnValue(
+ (yield (yield self.calendarUnderTest())
+ .calendarObjectWithName("1.ics")))
def test_calendarStoreProvides(self):
@@ -223,20 +229,24 @@
self.assertProvides(ICalendarHome, self.homeUnderTest())
+ @inlineCallbacks
def test_calendarProvides(self):
"""
The calendars generated by the calendar store provide L{ICalendar} and
its required attributes.
"""
- self.assertProvides(ICalendar, self.calendarUnderTest())
+ self.assertProvides(ICalendar, (yield self.calendarUnderTest()))
+ @inlineCallbacks
def test_calendarObjectProvides(self):
"""
The calendar objects generated by the calendar store provide
L{ICalendarObject} and its required attributes.
"""
- self.assertProvides(ICalendarObject, self.calendarObjectUnderTest())
+ self.assertProvides(
+ ICalendarObject, (yield self.calendarObjectUnderTest())
+ )
def notificationUnderTest(self):
@@ -296,10 +306,11 @@
self.assertIdentical(collection, notification.notificationCollection())
+ @inlineCallbacks
def test_notifierID(self):
- home = self.homeUnderTest()
+ home = yield self.homeUnderTest()
self.assertEquals(home.notifierID(), "CalDAV|home1")
- calendar = home.calendarWithName("calendar_1")
+ calendar = yield home.calendarWithName("calendar_1")
self.assertEquals(calendar.notifierID(), "CalDAV|home1")
self.assertEquals(calendar.notifierID(label="collection"), "CalDAV|home1/calendar_1")
@@ -325,14 +336,15 @@
self.assertEquals(txn.calendarHomeWithUID("xyzzy"), None)
+ @inlineCallbacks
def test_calendarWithName_exists(self):
"""
L{ICalendarHome.calendarWithName} returns an L{ICalendar} provider,
whose name matches the one passed in.
"""
- home = self.homeUnderTest()
+ home = yield self.homeUnderTest()
for name in home1_calendarNames:
- calendar = home.calendarWithName(name)
+ calendar = yield home.calendarWithName(name)
if calendar is None:
self.fail("calendar %r didn't exist" % (name,))
self.assertProvides(ICalendar, calendar)
@@ -344,30 +356,35 @@
"""
L{ICalendar.rename} changes the name of the L{ICalendar}.
"""
- home = self.homeUnderTest()
- calendar = home.calendarWithName("calendar_1")
+ home = yield self.homeUnderTest()
+ calendar = yield home.calendarWithName("calendar_1")
calendar.rename("some_other_name")
+ @inlineCallbacks
def positiveAssertions():
self.assertEquals(calendar.name(), "some_other_name")
- self.assertEquals(calendar, home.calendarWithName("some_other_name"))
- self.assertEquals(None, home.calendarWithName("calendar_1"))
- positiveAssertions()
+ self.assertEquals(
+ calendar, (yield home.calendarWithName("some_other_name")))
+ self.assertEquals(
+ None, (yield home.calendarWithName("calendar_1")))
+ yield positiveAssertions()
yield self.commit()
- home = self.homeUnderTest()
- calendar = home.calendarWithName("some_other_name")
- positiveAssertions()
+ home = yield self.homeUnderTest()
+ calendar = yield home.calendarWithName("some_other_name")
+ yield positiveAssertions()
# FIXME: revert
# FIXME: test for multiple renames
# FIXME: test for conflicting renames (a->b, c->a in the same txn)
+ @inlineCallbacks
def test_calendarWithName_absent(self):
"""
L{ICalendarHome.calendarWithName} returns C{None} for calendars which
do not exist.
"""
- self.assertEquals(self.homeUnderTest().calendarWithName("xyzzy"),
- None)
+ home = yield self.homeUnderTest()
+ calendar = yield home.calendarWithName("xyzzy")
+ self.assertEquals(calendar, None)
@inlineCallbacks
@@ -376,20 +393,22 @@
L{ICalendarHome.createCalendarWithName} creates a new L{ICalendar} that
can be retrieved with L{ICalendarHome.calendarWithName}.
"""
- home = self.homeUnderTest()
+ home = yield self.homeUnderTest()
name = "new"
- self.assertIdentical(home.calendarWithName(name), None)
+ self.assertIdentical((yield home.calendarWithName(name)), None)
home.createCalendarWithName(name)
- self.assertNotIdentical(home.calendarWithName(name), None)
+ self.assertNotIdentical((yield home.calendarWithName(name)), None)
+ @inlineCallbacks
def checkProperties():
- calendarProperties = home.calendarWithName(name).properties()
+ calendarProperties = (
+ yield home.calendarWithName(name)).properties()
self.assertEquals(
calendarProperties[
PropertyName.fromString(davxml.ResourceType.sname())
],
davxml.ResourceType.calendar #@UndefinedVariable
)
- checkProperties()
+ yield checkProperties()
yield self.commit()
@@ -398,12 +417,12 @@
[("update", "CalDAV|home1")])
# Make sure it's available in a new transaction; i.e. test the commit.
- home = self.homeUnderTest()
- self.assertNotIdentical(home.calendarWithName(name), None)
+ home = yield self.homeUnderTest()
+ self.assertNotIdentical((yield home.calendarWithName(name)), None)
# Sanity check: are the properties actually persisted? Check in
# subsequent transaction.
- checkProperties()
+ yield checkProperties()
# FIXME: no independent testing of the property store's persistence
# right now
@@ -432,9 +451,9 @@
# FIXME: test transactions
for name in home1_calendarNames:
- self.assertNotIdentical(home.calendarWithName(name), None)
+ self.assertNotIdentical((yield home.calendarWithName(name)), None)
home.removeCalendarWithName(name)
- self.assertEquals(home.calendarWithName(name), None)
+ self.assertEquals((yield home.calendarWithName(name)), None)
yield self.commit()
@@ -461,13 +480,14 @@
home.removeCalendarWithName, "xyzzy")
+ @inlineCallbacks
def test_calendarObjects(self):
"""
L{ICalendar.calendarObjects} will enumerate the calendar objects present
in the filesystem, in name order, but skip those with hidden names.
"""
- calendar1 = self.calendarUnderTest()
- calendarObjects = list(calendar1.calendarObjects())
+ calendar1 = yield self.calendarUnderTest()
+ calendarObjects = list((yield calendar1.calendarObjects()))
for calendarObject in calendarObjects:
self.assertProvides(ICalendarObject, calendarObject)
@@ -488,43 +508,46 @@
removed by L{Calendar.removeCalendarObjectWithName} in the same
transaction, even if it has not yet been committed.
"""
- calendar1 = self.calendarUnderTest()
+ calendar1 = yield self.calendarUnderTest()
calendar1.removeCalendarObjectWithName("2.ics")
calendarObjects = list(calendar1.calendarObjects())
self.assertEquals(set(o.name() for o in calendarObjects),
set(calendar1_objectNames) - set(["2.ics"]))
+ @inlineCallbacks
def test_ownerCalendarHome(self):
"""
L{ICalendar.ownerCalendarHome} should match the home UID.
"""
self.assertEquals(
- self.calendarUnderTest().ownerCalendarHome().uid(),
- self.homeUnderTest().uid()
+ (yield self.calendarUnderTest()).ownerCalendarHome().uid(),
+ (yield self.homeUnderTest()).uid()
)
+ @inlineCallbacks
def test_calendarObjectWithName_exists(self):
"""
L{ICalendar.calendarObjectWithName} returns an L{ICalendarObject}
provider for calendars which already exist.
"""
- calendar1 = self.calendarUnderTest()
+ calendar1 = yield self.calendarUnderTest()
for name in calendar1_objectNames:
- calendarObject = calendar1.calendarObjectWithName(name)
+ calendarObject = yield calendar1.calendarObjectWithName(name)
self.assertProvides(ICalendarObject, calendarObject)
self.assertEquals(calendarObject.name(), name)
# FIXME: add more tests based on CommonTests.requirements
+ @inlineCallbacks
def test_calendarObjectWithName_absent(self):
"""
L{ICalendar.calendarObjectWithName} returns C{None} for calendars which
don't exist.
"""
- calendar1 = self.calendarUnderTest()
- self.assertEquals(calendar1.calendarObjectWithName("xyzzy"), None)
+ calendar1 = yield self.calendarUnderTest()
+ self.assertEquals((yield calendar1.calendarObjectWithName("xyzzy")), None)
@inlineCallbacks
@@ -532,7 +555,7 @@
"""
Remove an existing calendar object.
"""
- calendar = self.calendarUnderTest()
+ calendar = yield self.calendarUnderTest()
for name in calendar1_objectNames:
uid = (u'uid' + name.rstrip(".ics"))
self.assertNotIdentical(calendar.calendarObjectWithUID(uid),
@@ -561,11 +584,12 @@
]
)
+ @inlineCallbacks
def test_removeCalendarObjectWithName_exists(self):
"""
Remove an existing calendar object.
"""
- calendar = self.calendarUnderTest()
+ calendar = yield self.calendarUnderTest()
for name in calendar1_objectNames:
self.assertNotIdentical(
calendar.calendarObjectWithName(name), None
@@ -576,37 +600,44 @@
)
+ @inlineCallbacks
def test_removeCalendarObjectWithName_absent(self):
"""
Attempt to remove an non-existing calendar object should raise.
"""
- calendar = self.calendarUnderTest()
+ calendar = yield self.calendarUnderTest()
self.assertRaises(
NoSuchObjectResourceError,
calendar.removeCalendarObjectWithName, "xyzzy"
)
+ @inlineCallbacks
def test_calendarName(self):
"""
L{Calendar.name} reflects the name of the calendar.
"""
- self.assertEquals(self.calendarUnderTest().name(), "calendar_1")
+ self.assertEquals((yield self.calendarUnderTest()).name(), "calendar_1")
+ @inlineCallbacks
def test_calendarObjectName(self):
"""
L{ICalendarObject.name} reflects the name of the calendar object.
"""
- self.assertEquals(self.calendarObjectUnderTest().name(), "1.ics")
+ self.assertEquals(
+ (yield self.calendarObjectUnderTest()).name(),
+ "1.ics"
+ )
+ @inlineCallbacks
def test_component(self):
"""
L{ICalendarObject.component} returns a L{VComponent} describing the
calendar data underlying that calendar object.
"""
- component = self.calendarObjectUnderTest().component()
+ component = (yield self.calendarObjectUnderTest()).component()
self.failUnless(
isinstance(component, VComponent),
@@ -618,24 +649,28 @@
self.assertEquals(component.resourceUID(), "uid1")
+ @inlineCallbacks
def test_iCalendarText(self):
"""
L{ICalendarObject.iCalendarText} returns a C{str} describing the same
data provided by L{ICalendarObject.component}.
"""
- text = self.calendarObjectUnderTest().iCalendarText()
+ text = (yield self.calendarObjectUnderTest()).iCalendarText()
self.assertIsInstance(text, str)
self.failUnless(text.startswith("BEGIN:VCALENDAR\r\n"))
self.assertIn("\r\nUID:uid1\r\n", text)
self.failUnless(text.endswith("\r\nEND:VCALENDAR\r\n"))
+ @inlineCallbacks
def test_calendarObjectUID(self):
"""
L{ICalendarObject.uid} returns a C{str} describing the C{UID} property
of the calendar object's component.
"""
- self.assertEquals(self.calendarObjectUnderTest().uid(), "uid1")
+ self.assertEquals(
+ (yield self.calendarObjectUnderTest()).uid(), "uid1"
+ )
def test_organizer(self):
@@ -645,20 +680,23 @@
component.
"""
self.assertEquals(
- self.calendarObjectUnderTest().organizer(),
+ (yield self.calendarObjectUnderTest()).organizer(),
"mailto:wsanchez at apple.com"
)
+ @inlineCallbacks
def test_calendarObjectWithUID_absent(self):
"""
L{ICalendar.calendarObjectWithUID} returns C{None} for calendars which
don't exist.
"""
- calendar1 = self.calendarUnderTest()
- self.assertEquals(calendar1.calendarObjectWithUID("xyzzy"), None)
+ calendar1 = yield self.calendarUnderTest()
+ self.assertEquals((yield calendar1.calendarObjectWithUID("xyzzy")),
+ None)
+ @inlineCallbacks
def test_calendars(self):
"""
L{ICalendarHome.calendars} returns an iterable of L{ICalendar}
@@ -667,13 +705,13 @@
"""
# Add a dot directory to make sure we don't find it
# self.home1._path.child(".foo").createDirectory()
- home = self.homeUnderTest()
- calendars = list(home.calendars())
+ home = yield self.homeUnderTest()
+ calendars = list((yield home.calendars()))
for calendar in calendars:
self.assertProvides(ICalendar, calendar)
self.assertEquals(calendar,
- home.calendarWithName(calendar.name()))
+ (yield home.calendarWithName(calendar.name())))
self.assertEquals(
set(c.name() for c in calendars),
@@ -699,7 +737,7 @@
L{ICalendar.createCalendarObjectWithName} creates a new
L{ICalendarObject}.
"""
- calendar1 = self.calendarUnderTest()
+ calendar1 = yield self.calendarUnderTest()
name = "4.ics"
self.assertIdentical(calendar1.calendarObjectWithName(name), None)
component = VComponent.fromString(event4_text)
@@ -726,7 +764,7 @@
L{CalendarObjectNameAlreadyExistsError} if a calendar object with the
given name already exists in that calendar.
"""
- cal = self.calendarUnderTest()
+ cal = yield self.calendarUnderTest()
comp = VComponent.fromString(event4_text)
self.assertRaises(
ObjectResourceNameAlreadyExistsError,
@@ -735,6 +773,7 @@
)
+ @inlineCallbacks
def test_createCalendarObjectWithName_invalid(self):
"""
L{ICalendar.createCalendarObjectWithName} raises
@@ -743,17 +782,17 @@
"""
self.assertRaises(
InvalidObjectResourceError,
- self.calendarUnderTest().createCalendarObjectWithName,
+ (yield self.calendarUnderTest()).createCalendarObjectWithName,
"new", VComponent.fromString(event4notCalDAV_text)
)
-
+ @inlineCallbacks
def test_setComponent_invalid(self):
"""
L{ICalendarObject.setComponent} raises L{InvalidICalendarDataError} if
presented with invalid iCalendar text.
"""
- calendarObject = self.calendarObjectUnderTest()
+ calendarObject = yield self.calendarObjectUnderTest()
self.assertRaises(
InvalidObjectResourceError,
calendarObject.setComponent,
@@ -761,14 +800,15 @@
)
+ @inlineCallbacks
def test_setComponent_uidchanged(self):
"""
L{ICalendarObject.setComponent} raises L{InvalidCalendarComponentError}
when given a L{VComponent} whose UID does not match its existing UID.
"""
- calendar1 = self.calendarUnderTest()
+ calendar1 = yield self.calendarUnderTest()
component = VComponent.fromString(event4_text)
- calendarObject = calendar1.calendarObjectWithName("1.ics")
+ calendarObject = yield calendar1.calendarObjectWithName("1.ics")
self.assertRaises(
InvalidObjectResourceError,
calendarObject.setComponent, component
@@ -783,23 +823,24 @@
"""
txn = self.transactionUnderTest()
noHomeUID = "xyzzy"
- calendarHome = txn.calendarHomeWithUID(
+ calendarHome = yield txn.calendarHomeWithUID(
noHomeUID,
create=True
)
+ @inlineCallbacks
def readOtherTxn():
otherTxn = self.savedStore.newTransaction(self.id() + "other txn")
self.addCleanup(otherTxn.commit)
- return otherTxn.calendarHomeWithUID(noHomeUID)
+ returnValue((yield otherTxn.calendarHomeWithUID(noHomeUID)))
self.assertProvides(ICalendarHome, calendarHome)
# Default calendar should be automatically created.
self.assertProvides(ICalendar,
- calendarHome.calendarWithName("calendar"))
+ (yield calendarHome.calendarWithName("calendar")))
# A concurrent transaction shouldn't be able to read it yet:
- self.assertIdentical(readOtherTxn(), None)
+ self.assertIdentical((yield readOtherTxn()), None)
yield self.commit()
# But once it's committed, other transactions should see it.
- self.assertProvides(ICalendarHome, readOtherTxn())
+ self.assertProvides(ICalendarHome, (yield readOtherTxn()))
@inlineCallbacks
@@ -810,8 +851,8 @@
"""
component = VComponent.fromString(event1modified_text)
- calendar1 = self.calendarUnderTest()
- calendarObject = calendar1.calendarObjectWithName("1.ics")
+ calendar1 = yield self.calendarUnderTest()
+ calendarObject = yield calendar1.calendarObjectWithName("1.ics")
oldComponent = calendarObject.component()
self.assertNotEqual(component, oldComponent)
calendarObject.setComponent(component)
@@ -849,30 +890,33 @@
self.checkPropertiesMethod(self.homeUnderTest())
+ @inlineCallbacks
def test_calendarProperties(self):
"""
L{ICalendar.properties} returns a property store.
"""
- self.checkPropertiesMethod(self.calendarUnderTest())
+ self.checkPropertiesMethod((yield self.calendarUnderTest()))
+ @inlineCallbacks
def test_calendarObjectProperties(self):
"""
L{ICalendarObject.properties} returns a property store.
"""
- self.checkPropertiesMethod(self.calendarObjectUnderTest())
+ self.checkPropertiesMethod((yield self.calendarObjectUnderTest()))
+ @inlineCallbacks
def test_newCalendarObjectProperties(self):
"""
L{ICalendarObject.properties} returns an empty property store for a
calendar object which has been created but not committed.
"""
- calendar = self.calendarUnderTest()
+ calendar = yield self.calendarUnderTest()
calendar.createCalendarObjectWithName(
"4.ics", VComponent.fromString(event4_text)
)
- newEvent = calendar.calendarObjectWithName("4.ics")
+ newEvent = yield calendar.calendarObjectWithName("4.ics")
self.assertEquals(newEvent.properties().items(), [])
@@ -890,15 +934,15 @@
propertyContent.name = propertyName.name
propertyContent.namespace = propertyName.namespace
- self.calendarObjectUnderTest().properties()[
+ (yield self.calendarObjectUnderTest()).properties()[
propertyName] = propertyContent
yield self.commit()
# Sanity check; are properties even readable in a separate transaction?
# Should probably be a separate test.
self.assertEquals(
- self.calendarObjectUnderTest().properties()[propertyName],
+ (yield self.calendarObjectUnderTest()).properties()[propertyName],
propertyContent)
- obj = self.calendarObjectUnderTest()
+ obj = yield self.calendarObjectUnderTest()
event1_text = obj.iCalendarText()
event1_text_withDifferentSubject = event1_text.replace(
"SUMMARY:CalDAV protocol updates",
@@ -913,7 +957,7 @@
# caching that may take place.
yield self.commit()
self.assertEquals(
- self.calendarObjectUnderTest().properties()[propertyName],
+ (yield self.calendarObjectUnderTest()).properties()[propertyName],
propertyContent
)
@@ -956,17 +1000,19 @@
END:VCALENDAR
""".strip().split("\n"))
+
+ @inlineCallbacks
def test_dropboxID(self):
"""
L{ICalendarObject.dropboxID} should synthesize its dropbox from the X
-APPLE-DROPBOX property, if available.
"""
- cal = self.calendarUnderTest()
+ cal = yield self.calendarUnderTest()
cal.createCalendarObjectWithName("drop.ics", VComponent.fromString(
self.eventWithDropbox
)
)
- obj = cal.calendarObjectWithName("drop.ics")
+ obj = yield cal.calendarObjectWithName("drop.ics")
self.assertEquals(obj.dropboxID(), "some-dropbox-id")
@@ -978,7 +1024,7 @@
-APPLE-DROPBOX} property URI.
"""
objName = "with-dropbox.ics"
- cal = self.calendarUnderTest()
+ cal = yield self.calendarUnderTest()
cal.createCalendarObjectWithName(
objName, VComponent.fromString(
self.eventWithDropbox
@@ -986,7 +1032,7 @@
)
yield self.commit()
home = self.homeUnderTest()
- cal = self.calendarUnderTest()
+ cal = yield self.calendarUnderTest()
fromName = cal.calendarObjectWithName(objName)
fromDropbox = home.calendarObjectWithDropboxID("some-dropbox-id")
self.assertEquals(fromName, fromDropbox)
@@ -997,7 +1043,7 @@
"""
Common logic for attachment-creation tests.
"""
- obj = self.calendarObjectUnderTest()
+ obj = yield self.calendarObjectUnderTest()
t = obj.createAttachmentWithName("new.attachment", MimeType("text", "x-fixture"))
t.write("new attachment")
t.write(" text")
@@ -1056,7 +1102,7 @@
"""
@inlineCallbacks
def deleteIt(ignored):
- obj = self.calendarObjectUnderTest()
+ obj = yield self.calendarObjectUnderTest()
obj.removeAttachmentWithName("new.attachment")
obj = yield refresh(obj)
self.assertIdentical(
@@ -1086,13 +1132,14 @@
named 'dropbox', but this should not be seen as a calendar by
L{ICalendarHome.calendarWithName} or L{ICalendarHome.calendars}.
"""
- obj = self.calendarObjectUnderTest()
- t = obj.createAttachmentWithName("new.attachment", MimeType("text", "plain"))
+ obj = yield self.calendarObjectUnderTest()
+ t = obj.createAttachmentWithName("new.attachment",
+ MimeType("text", "plain"))
t.write("new attachment text")
t.loseConnection()
yield self.commit()
- self.assertEquals(self.homeUnderTest().calendarWithName("dropbox"),
- None)
+ home = (yield self.homeUnderTest())
+ self.assertEquals((yield home.calendarWithName("dropbox")), None)
self.assertEquals(
set([n.name() for n in self.homeUnderTest().calendars()]),
set(home1_calendarNames))
@@ -1105,21 +1152,23 @@
L{ITransaction.commit} has already been called raises an
L{AlreadyFinishedError}.
"""
- self.calendarObjectUnderTest()
+ yield self.calendarObjectUnderTest()
txn = self.lastTransaction
yield self.commit()
self.assertRaises(AlreadyFinishedError, txn.commit)
self.assertRaises(AlreadyFinishedError, txn.abort)
+ @inlineCallbacks
def test_dontLeakCalendars(self):
"""
Calendars in one user's calendar home should not show up in another
user's calendar home.
"""
- home2 = self.transactionUnderTest().calendarHomeWithUID(
+ home2 = yield self.transactionUnderTest().calendarHomeWithUID(
"home2", create=True)
- self.assertIdentical(home2.calendarWithName("calendar_1"), None)
+ self.assertIdentical(
+ (yield home2.calendarWithName("calendar_1")), None)
def test_dontLeakObjects(self):
@@ -1130,9 +1179,10 @@
home1 = self.homeUnderTest()
home2 = self.transactionUnderTest().calendarHomeWithUID(
"home2", create=True)
- calendar1 = home1.calendarWithName("calendar_1")
- calendar2 = home2.calendarWithName("calendar")
- objects = list(home2.calendarWithName("calendar").calendarObjects())
+ calendar1 = yield home1.calendarWithName("calendar_1")
+ calendar2 = yield home2.calendarWithName("calendar")
+ objects = list(
+ (yield home2.calendarWithName("calendar").calendarObjects()))
self.assertEquals(objects, [])
for resourceName in self.requirements['home1']['calendar_1'].keys():
obj = calendar1.calendarObjectWithName(resourceName)
Modified: CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/test_sql.py 2010-09-23 21:00:41 UTC (rev 6357)
+++ CalendarServer/branches/users/glyph/more-deferreds-6/txdav/caldav/datastore/test/test_sql.py 2010-09-23 21:28:48 UTC (rev 6358)
@@ -112,9 +112,11 @@
L{ICalendarObject.attachmentWithName}.
"""
yield self.createAttachmentTest(lambda x: x)
- attachmentRoot = self.calendarObjectUnderTest()._txn._store.attachmentsPath
+ attachmentRoot = (yield self.calendarObjectUnderTest())._txn._store.attachmentsPath
attachmentPath = attachmentRoot.child("ho").child("me").child("home1")
- attachmentPath = attachmentPath.child(self.calendarObjectUnderTest().uid()).child("new.attachment")
+ attachmentPath = attachmentPath.child(
+ (yield self.calendarObjectUnderTest()).uid()).child(
+ "new.attachment")
self.assertTrue(attachmentPath.isfile())
def test_migrateCalendarFromFile(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100923/32fbbec3/attachment-0001.html>
More information about the calendarserver-changes
mailing list