<!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>[13055] CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools</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/13055">13055</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 09:42:29 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More yields in calverify</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolscalverifypy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_calverifypy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolscalverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py (13054 => 13055)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py        2014-03-31 12:54:04 UTC (rev 13054)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/calverify.py        2014-03-31 16:42:29 UTC (rev 13055)
</span><span class="lines">@@ -75,7 +75,9 @@
</span><span class="cx"> from txdav.caldav.datastore.sql import CalendarStoreFeatures
</span><span class="cx"> from txdav.common.datastore.sql_tables import schema, _BIND_MODE_OWN
</span><span class="cx"> from txdav.common.icommondatastore import InternalDataStoreError
</span><del>-from txdav.who.idirectory import RecordType as CalRecordType
</del><ins>+from txdav.who.idirectory import (
+ RecordType as CalRecordType, AutoScheduleMode
+)
</ins><span class="cx"> from calendarserver.tools.cmdline import utilityMain, WorkerService
</span><span class="cx">
</span><span class="cx"> from calendarserver.tools import tables
</span><span class="lines">@@ -1194,7 +1196,7 @@
</span><span class="cx"> component.validOrganizerForScheduling(doFix=False)
</span><span class="cx"> if component.hasDuplicateAlarms(doFix=False):
</span><span class="cx"> raise InvalidICalendarDataError("Duplicate VALARMS")
</span><del>- self.noPrincipalPathCUAddresses(component, doFix=False)
</del><ins>+ yield self.noPrincipalPathCUAddresses(component, doFix=False)
</ins><span class="cx"> if self.options["ical"]:
</span><span class="cx"> self.attendeesWithoutOrganizer(component, doFix=False)
</span><span class="cx">
</span><span class="lines">@@ -1215,15 +1217,17 @@
</span><span class="cx"> returnValue((result, message,))
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @inlineCallbacks
</ins><span class="cx"> def noPrincipalPathCUAddresses(self, component, doFix):
</span><span class="cx">
</span><del>- def lookupFunction(cuaddr, principalFunction, conf):
</del><ins>+ @inlineCallbacks
+ def lookupFunction(cuaddr, recordFunction, conf):
</ins><span class="cx">
</span><span class="cx"> # Return cached results, if any.
</span><span class="cx"> if cuaddr in self.cuaCache:
</span><del>- return self.cuaCache[cuaddr]
</del><ins>+ returnValue(self.cuaCache[cuaddr])
</ins><span class="cx">
</span><del>- result = normalizationLookup(cuaddr, principalFunction, conf)
</del><ins>+ result = yield normalizationLookup(cuaddr, recordFunction, conf)
</ins><span class="cx"> _ignore_name, guid, _ignore_cuaddrs = result
</span><span class="cx"> if guid is None:
</span><span class="cx"> if cuaddr.find("__uids__") != -1:
</span><span class="lines">@@ -1232,7 +1236,7 @@
</span><span class="cx">
</span><span class="cx"> # Cache the result
</span><span class="cx"> self.cuaCache[cuaddr] = result
</span><del>- return result
</del><ins>+ returnValue(result)
</ins><span class="cx">
</span><span class="cx"> for subcomponent in component.subcomponents():
</span><span class="cx"> if subcomponent.name() in ignoredComponents:
</span><span class="lines">@@ -1244,13 +1248,13 @@
</span><span class="cx"> # http(s) principals need to be converted to urn:uuid
</span><span class="cx"> if cuaddr.startswith("http"):
</span><span class="cx"> if doFix:
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ORGANIZER starts with 'http(s)'")
</span><span class="cx"> elif cuaddr.startswith("mailto:"):
</span><del>- if lookupFunction(cuaddr, self.directoryService().principalForCalendarUserAddress, self.config)[1] is not None:
</del><ins>+ if (yield lookupFunction(cuaddr, self.directoryService().recordWithCalendarUserAddress, self.config))[1] is not None:
</ins><span class="cx"> if doFix:
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ORGANIZER starts with 'mailto:' and record exists")
</span><span class="cx"> else:
</span><span class="lines">@@ -1258,7 +1262,7 @@
</span><span class="cx"> if doFix:
</span><span class="cx"> # Add back in mailto: then re-normalize to urn:uuid if possible
</span><span class="cx"> organizer.setValue("mailto:%s" % (cuaddr,))
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx">
</span><span class="cx"> # Remove any SCHEDULE-AGENT=NONE
</span><span class="cx"> if organizer.parameterValue("SCHEDULE-AGENT", "SERVER") == "NONE":
</span><span class="lines">@@ -1281,13 +1285,13 @@
</span><span class="cx"> # http(s) principals need to be converted to urn:uuid
</span><span class="cx"> if cuaddr.startswith("http"):
</span><span class="cx"> if doFix:
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE starts with 'http(s)'")
</span><span class="cx"> elif cuaddr.startswith("mailto:"):
</span><del>- if lookupFunction(cuaddr, self.directoryService().principalForCalendarUserAddress, self.config)[1] is not None:
</del><ins>+ if (yield lookupFunction(cuaddr, self.directoryService().recordWithCalendarUserAddress, self.config))[1] is not None:
</ins><span class="cx"> if doFix:
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE starts with 'mailto:' and record exists")
</span><span class="cx"> else:
</span><span class="lines">@@ -1295,7 +1299,7 @@
</span><span class="cx"> if doFix:
</span><span class="cx"> # Add back in mailto: then re-normalize to urn:uuid if possible
</span><span class="cx"> attendee.setValue("mailto:%s" % (cuaddr,))
</span><del>- component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().principalForCalendarUserAddress)
</del><ins>+ yield component.normalizeCalendarUserAddresses(lookupFunction, self.directoryService().recordWithCalendarUserAddress)
</ins><span class="cx"> else:
</span><span class="cx"> raise InvalidICalendarDataError("iCalendar ATTENDEE missing mailto:")
</span><span class="cx">
</span><span class="lines">@@ -1347,7 +1351,7 @@
</span><span class="cx"> component.validCalendarForCalDAV(methodAllowed=isinbox)
</span><span class="cx"> component.validOrganizerForScheduling(doFix=True)
</span><span class="cx"> component.hasDuplicateAlarms(doFix=True)
</span><del>- self.noPrincipalPathCUAddresses(component, doFix=True)
</del><ins>+ yield self.noPrincipalPathCUAddresses(component, doFix=True)
</ins><span class="cx"> if self.options["ical"]:
</span><span class="cx"> self.attendeesWithoutOrganizer(component, doFix=True)
</span><span class="cx"> except ValueError:
</span><span class="lines">@@ -1978,7 +1982,8 @@
</span><span class="cx">
</span><span class="cx"> # Need to know whether the attendee is a location or resource with auto-accept set
</span><span class="cx"> record = yield self.directoryService().recordWithUID(attendee)
</span><del>- if record.autoSchedule:
</del><ins>+ autoScheduleMode = getattr(record, "autoScheduleMode", None)
+ if autoScheduleMode not in (None, AutoScheduleMode.none):
</ins><span class="cx"> # Log details about the event so we can have a human manually process
</span><span class="cx"> self.fixedAutoAccepts.append(details)
</span><span class="cx">
</span><span class="lines">@@ -2176,7 +2181,7 @@
</span><span class="cx"> continue
</span><span class="cx">
</span><span class="cx"> rname = record.displayName
</span><del>- auto = record.autoSchedule
</del><ins>+ autoScheduleMode = getattr(record, "autoSchedule", AutoScheduleMode.none)
</ins><span class="cx">
</span><span class="cx"> if len(uuids) > 1 and not self.options["summary"]:
</span><span class="cx"> self.output.write("\n\n-----------------------------\n")
</span><span class="lines">@@ -2202,7 +2207,7 @@
</span><span class="cx"> if not self.options["summary"]:
</span><span class="cx"> self.logResult("UUID to process", uuid)
</span><span class="cx"> self.logResult("Record name", rname)
</span><del>- self.logResult("Auto-schedule", "True" if auto else "False")
</del><ins>+ self.logResult("Auto-schedule-mode", autoScheduleMode.description)
</ins><span class="cx"> self.addSummaryBreak()
</span><span class="cx"> self.logResult("Number of events to process", self.total)
</span><span class="cx">
</span><span class="lines">@@ -2213,7 +2218,7 @@
</span><span class="cx"> else:
</span><span class="cx"> doubled = False
</span><span class="cx">
</span><del>- self.uuid_details.append(UUIDDetails(uuid, rname, auto, doubled))
</del><ins>+ self.uuid_details.append(UUIDDetails(uuid, rname, autoScheduleMode, doubled))
</ins><span class="cx">
</span><span class="cx"> if not self.options["summary"]:
</span><span class="cx"> self.printSummary()
</span><span class="lines">@@ -2231,7 +2236,7 @@
</span><span class="cx"> table.addRow((
</span><span class="cx"> item.uuid,
</span><span class="cx"> item.rname,
</span><del>- item.auto,
</del><ins>+ item.autoScheduleMode,
</ins><span class="cx"> item.doubled,
</span><span class="cx"> ))
</span><span class="cx"> doubled += 1
</span><span class="lines">@@ -2599,9 +2604,10 @@
</span><span class="cx"> if self.options["no-organizer"]:
</span><span class="cx"> fail = True
</span><span class="cx"> else:
</span><del>- principal = self.directoryService().principalForCalendarUserAddress(organizer)
</del><ins>+ principal = yield self.directoryService().recordWithCalendarUserAddress(organizer)
+ # FIXME: Why the mix of records and principals here?
</ins><span class="cx"> if principal is None and organizer.startswith("urn:uuid:"):
</span><del>- principal = self.directoryService().principalCollection.principalForUID(organizer[9:])
</del><ins>+ principal = yield self.directoryService().principalCollection.principalForUID(organizer[9:])
</ins><span class="cx"> if principal is None:
</span><span class="cx"> if self.options["invalid-organizer"]:
</span><span class="cx"> fail = True
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolstesttest_calverifypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py (13054 => 13055)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py        2014-03-31 12:54:04 UTC (rev 13054)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/test/test_calverify.py        2014-03-31 16:42:29 UTC (rev 13055)
</span><span class="lines">@@ -471,20 +471,7 @@
</span><span class="cx">
</span><span class="cx"> number_to_process = len(requirements["home1"]["calendar_1"])
</span><span class="cx">
</span><del>- def configure(self):
- super(CalVerifyDataTests, self).configure()
- self.patch(config.DirectoryService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "accounts.xml"
- )
- )
- self.patch(config.ResourceService.params, "xmlFile",
- os.path.join(
- os.path.dirname(__file__), "calverify", "resources.xml"
- )
- )
</del><span class="cx">
</span><del>-
</del><span class="cx"> @inlineCallbacks
</span><span class="cx"> def populate(self):
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>