[CalendarServer-changes] [14950] CalendarServer/trunk/txdav

[source_changes at macosforge.org]

Revision: 14950
          http://trac.calendarserver.org//changeset/14950
Author:   cdaboo at apple.com
Date:     2015-07-06 19:24:01 -0700 (Mon, 06 Jul 2015)
Log Message:
-----------
Fix for tests that fail at particular times of day.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/caldav/datastore/sql.py
    CalendarServer/trunk/txdav/who/test/test_group_attendees.py

Modified: CalendarServer/trunk/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-07-07 00:28:41 UTC (rev 14949)
+++ CalendarServer/trunk/txdav/caldav/datastore/sql.py	2015-07-07 02:24:01 UTC (rev 14950)
@@ -2843,6 +2843,8 @@
             else:
                 groupUID = uidFromCalendarUserAddress(groupCUA)
             group = yield self._txn.groupByUID(groupUID)
+            if group is None:
+                continue
 
             if group.groupID in groupIDToMembershipHashMap:
                 if groupIDToMembershipHashMap[group.groupID].membershipHash != group.membershipHash:

Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py	2015-07-07 00:28:41 UTC (rev 14949)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py	2015-07-07 02:24:01 UTC (rev 14950)
@@ -186,7 +186,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART:{nowDate}T100000Z
+DTSTART:{nowDate_fwd1}T100000Z
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -202,7 +202,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART:{nowDate}T100000Z
+DTSTART:{nowDate_fwd1}T100000Z
 DURATION:PT1H
 ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
 ATTENDEE;CUTYPE=X-SERVER-GROUP;SCHEDULE-STATUS=3.7:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
@@ -410,7 +410,7 @@
     @inlineCallbacks
     def test_groupPutOldEvent(self):
         """
-        Test that old event with group attendee is expaned but not linked to group update
+        Test that old event with group attendee is expanded but not linked to group update
         """
 
         data_put_1 = """BEGIN:VCALENDAR
@@ -420,7 +420,7 @@
 BEGIN:VEVENT
 DTSTAMP:20051222T205953Z
 CREATED:20060101T150000Z
-DTSTART:{nowDate}T100000Z
+DTSTART:{nowDate_back2}T100000Z
 DURATION:PT1H
 SUMMARY:event 1
 UID:event1 at ninevah.local
@@ -436,7 +436,7 @@
 PRODID:-//Example Inc.//Example Calendar//EN
 BEGIN:VEVENT
 UID:event1 at ninevah.local
-DTSTART:{nowDate}T100000Z
+DTSTART:{nowDate_back2}T100000Z
 DURATION:PT1H
 ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
 ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;SCHEDULE-STATUS=2.7:urn:x-uid:group01
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150706/7bc4a03f/attachment.html>