<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[14940] CalendarServer/trunk/txdav/who/test/test_group_attendees.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/14940">14940</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-02 08:05:35 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure order of attendee properties does not cause tests to fail.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavwhotesttest_group_attendeespy">CalendarServer/trunk/txdav/who/test/test_group_attendees.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavwhotesttest_group_attendeespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_group_attendees.py (14939 => 14940)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2015-07-02 00:53:00 UTC (rev 14939)
+++ CalendarServer/trunk/txdav/who/test/test_group_attendees.py 2015-07-02 15:05:35 UTC (rev 14940)
</span><span class="lines">@@ -87,23 +87,26 @@
</span><span class="cx">
</span><span class="cx"> def _assertICalStrEqual(self, iCalStr1, iCalStr2):
</span><span class="cx">
</span><del>- def orderMemberValues(event):
</del><ins>+ def orderAttendeePropAndMemberValues(event):
</ins><span class="cx">
</span><span class="cx"> for component in event.subcomponents(ignore=True):
</span><span class="cx"> # remove all values and add them again
</span><span class="cx"> # this is sort of a hack, better pycalendar has ordering
</span><del>- for attendeeProp in tuple(component.properties("ATTENDEE")):
</del><ins>+ attendees = sorted(list(component.properties("ATTENDEE")), key=lambda x: x.value())
+ component.removeProperty("ATTENDEE")
+ for attendeeProp in attendees:
</ins><span class="cx"> if attendeeProp.hasParameter("MEMBER"):
</span><span class="cx"> parameterValues = tuple(attendeeProp.parameterValues("MEMBER"))
</span><span class="cx"> for paramterValue in parameterValues:
</span><span class="cx"> attendeeProp.removeParameterValue("MEMBER", paramterValue)
</span><span class="cx"> attendeeProp.setParameter("MEMBER", sorted(parameterValues))
</span><ins>+ component.addProperty(attendeeProp)
</ins><span class="cx">
</span><span class="cx"> return event
</span><span class="cx">
</span><span class="cx"> self.assertEqualCalendarData(
</span><del>- orderMemberValues(Component.fromString(normalize_iCalStr(iCalStr1))),
- orderMemberValues(Component.fromString(normalize_iCalStr(iCalStr2)))
</del><ins>+ orderAttendeePropAndMemberValues(Component.fromString(normalize_iCalStr(iCalStr1))),
+ orderAttendeePropAndMemberValues(Component.fromString(normalize_iCalStr(iCalStr2)))
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -216,7 +219,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -267,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -462,7 +465,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -567,7 +570,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 0)
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -585,7 +588,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_3.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_3.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 1)
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -598,7 +601,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_4.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_4.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="lines">@@ -709,7 +712,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(i, **self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(i, **self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 0)
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -728,7 +731,7 @@
</span><span class="cx"> for i in userRange:
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_3.format(i, **self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_3.format(i, **self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", len(userRange))
</span><span class="cx"> yield self.commit()
</span><span class="lines">@@ -742,7 +745,7 @@
</span><span class="cx"> for i in userRange:
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_4.format(i, **self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_4.format(i, **self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="lines">@@ -851,7 +854,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 1)
</span><span class="cx">
</span><span class="lines">@@ -863,7 +866,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
</span><span class="cx"> self.assertEqual(len(wps), 0)
</span><span class="lines">@@ -887,7 +890,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> '''
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="lines">@@ -1009,7 +1012,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 1)
</span><span class="cx">
</span><span class="lines">@@ -1021,7 +1024,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
</span><span class="cx"> if len(wps): # This is needed because the test currently fails and does actually create job items we have to wait for
</span><span class="lines">@@ -1046,7 +1049,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1200,13 +1203,13 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="cx"> self.assertEqual(len(cobjs), 1)
</span><span class="cx"> vcalendar = yield cobjs[0].componentForUser()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1_user01.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1_user01.format(**self.dtsubs))
</ins><span class="cx"> user01_cname = cobjs[0].name()
</span><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="inbox", home="user01")
</span><span class="lines">@@ -1236,10 +1239,10 @@
</span><span class="cx"> props.update(self.dtsubs)
</span><span class="cx">
</span><span class="cx"> if cobj.name() == "data1.ics":
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**props))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**props))
</ins><span class="cx"> props_orig = props
</span><span class="cx"> else:
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_3.format(**props))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_3.format(**props))
</ins><span class="cx"> props_new = props
</span><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="lines">@@ -1247,9 +1250,9 @@
</span><span class="cx"> for cobj in cobjs:
</span><span class="cx"> vcalendar = yield cobj.componentForUser()
</span><span class="cx"> if cobj.name() == user01_cname:
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2_user01.format(**props_orig))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2_user01.format(**props_orig))
</ins><span class="cx"> else:
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_3_user01.format(**props_new))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_3_user01.format(**props_new))
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="inbox", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="lines">@@ -1374,7 +1377,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_1.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_1.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 0)
</span><span class="cx">
</span><span class="lines">@@ -1400,16 +1403,16 @@
</span><span class="cx"> props.update(self.dtsubs)
</span><span class="cx">
</span><span class="cx"> if cobj.name() == "data1.ics":
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**props))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**props))
</ins><span class="cx"> props_orig = props
</span><span class="cx"> else:
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_3.format(**props))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_3.format(**props))
</ins><span class="cx">
</span><span class="cx"> cal = yield self.calendarUnderTest(name="calendar", home="user01")
</span><span class="cx"> cobjs = yield cal.objectResources()
</span><span class="cx"> self.assertEqual(len(cobjs), 1)
</span><span class="cx"> vcalendar = yield cobjs[0].componentForUser()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2_user01.format(**props_orig))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2_user01.format(**props_orig))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1805,7 +1808,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 1)
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span><span class="lines">@@ -1909,7 +1912,7 @@
</span><span class="cx">
</span><span class="cx"> cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
</span><span class="cx"> vcalendar = yield cobj.component()
</span><del>- self.assertEqualCalendarData(vcalendar, data_get_2.format(**self.dtsubs))
</del><ins>+ self._assertICalStrEqual(vcalendar, data_get_2.format(**self.dtsubs))
</ins><span class="cx">
</span><span class="cx"> yield self._verifyObjectResourceCount("user01", 1)
</span><span class="cx"> groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
</span></span></pre>
</div>
</div>
</body>
</html>