[CalendarServer-changes] [14332] CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/ test_implicit.py

source_changes at macosforge.org source_changes at macosforge.org
Wed Jan 21 11:09:42 PST 2015


Revision: 14332
          http://trac.calendarserver.org//changeset/14332
Author:   cdaboo at apple.com
Date:     2015-01-21 11:09:42 -0800 (Wed, 21 Jan 2015)
Log Message:
-----------
Wait for data upgrade work to complete.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2015-01-21 00:39:38 UTC (rev 14331)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/test/test_implicit.py	2015-01-21 19:09:42 UTC (rev 14332)
@@ -1273,6 +1273,9 @@
 END:VEVENT
 END:VCALENDAR
 """
+
+        self.patch(CalendarObject.CalendarObjectUpgradeWork, "delay", 1)
+
         yield self._createCalendarObject(data1, "user01", "test.ics")
 
         cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
@@ -1287,8 +1290,18 @@
         # Because CUA normalization happens in component() now too...
         self.assertTrue(comp.getOrganizer().startswith("urn:x-uid:"))
         self.assertFalse(comp.getOrganizerScheduleAgent())
+        yield self.commit()
 
+        yield JobItem.waitEmpty(self.storeUnderTest().newTransaction, reactor, 60)
+
         cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+        comp = yield cobj.component()
+        # Because CUA normalization happens in component() now too...
+        self.assertTrue(comp.getOrganizer().startswith("urn:x-uid:"))
+        self.assertFalse(comp.getOrganizerScheduleAgent())
+        yield self.commit()
+
+        cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
         actualVersion = CalendarObject._currentDataVersion
         self.patch(CalendarObject, "_currentDataVersion", 0)
         yield cobj.setComponent(Component.fromString(data2))
@@ -1299,8 +1312,17 @@
         comp = yield cobj.component()
         self.assertTrue(comp.getOrganizer().startswith("urn:x-uid:"))
         self.assertTrue(comp.getOrganizerScheduleAgent())
+        yield self.commit()
 
+        yield JobItem.waitEmpty(self.storeUnderTest().newTransaction, reactor, 60)
 
+        cobj = yield self.calendarObjectUnderTest(home="user01", name="test.ics")
+        comp = yield cobj.component()
+        self.assertTrue(comp.getOrganizer().startswith("urn:x-uid:"))
+        self.assertTrue(comp.getOrganizerScheduleAgent())
+        yield self.commit()
+
+
     @inlineCallbacks
     def test_doImplicitScheduling_AttendeeEventNoOrganizerEvent(self):
         """
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150121/50f9c46c/attachment-0001.html>


More information about the calendarserver-changes mailing list