<!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>[13789] CalendarServer/trunk</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/13789">13789</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-24 09:36:26 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix use of inTransaction().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertoolsutilpy">CalendarServer/trunk/calendarserver/tools/util.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_deliverypy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertoolsutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/util.py (13788 => 13789)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/util.py 2014-07-24 16:02:02 UTC (rev 13788)
+++ CalendarServer/trunk/calendarserver/tools/util.py 2014-07-24 16:36:26 UTC (rev 13789)
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def booleanArgument(arg):
</span><del>- if arg in ("true", "yes", "yup", "uh-huh", "1", "t", "y"):
</del><ins>+ if arg in ("true", "yes", "yup", "uh-huh", "1", "t", "y"):
</ins><span class="cx"> return True
</span><span class="cx"> elif arg in ("false", "no", "nope", "nuh-uh", "0", "f", "n"):
</span><span class="cx"> return False
</span><span class="lines">@@ -312,14 +312,12 @@
</span><span class="cx"> os.chmod(dirpath, mode)
</span><span class="cx"> os.chown(dirpath, uid, gid)
</span><span class="cx"> except (OSError, IOError), e:
</span><del>- print("Unable to change mode/owner of %s: %s"
- % (dirpath, e))
</del><ins>+ print("Unable to change mode/owner of %s: %s" % (dirpath, e))
</ins><span class="cx">
</span><span class="cx"> print("Created directory: %s" % (dirpath,))
</span><span class="cx">
</span><span class="cx"> if not os.path.isdir(dirpath):
</span><del>- raise ConfigurationError("%s is not a directory: %s"
- % (description, dirpath))
</del><ins>+ raise ConfigurationError("%s is not a directory: %s" % (description, dirpath))
</ins><span class="cx">
</span><span class="cx"> if access and not os.access(dirpath, access):
</span><span class="cx"> raise ConfigurationError(
</span><span class="lines">@@ -340,8 +338,10 @@
</span><span class="cx">
</span><span class="cx"> if principalID.startswith("/"):
</span><span class="cx"> segments = principalID.strip("/").split("/")
</span><del>- if (len(segments) == 3 and
- segments[0] == "principals" and segments[1] == "__uids__"):
</del><ins>+ if (
+ len(segments) == 3 and
+ segments[0] == "principals" and segments[1] == "__uids__"
+ ):
</ins><span class="cx"> uid = segments[2]
</span><span class="cx"> else:
</span><span class="cx"> raise ValueError("Can't resolve all paths yet")
</span><span class="lines">@@ -396,8 +396,10 @@
</span><span class="cx">
</span><span class="cx"> if principalID.startswith("/"):
</span><span class="cx"> segments = principalID.strip("/").split("/")
</span><del>- if (len(segments) == 3 and
- segments[0] == "principals" and segments[1] == "__uids__"):
</del><ins>+ if (
+ len(segments) == 3 and
+ segments[0] == "principals" and segments[1] == "__uids__"
+ ):
</ins><span class="cx"> uid = segments[2]
</span><span class="cx"> else:
</span><span class="cx"> raise ValueError("Can't resolve all paths yet")
</span><span class="lines">@@ -468,8 +470,10 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def action_removeProxyPrincipal(rootResource, directory, store, principal, proxyPrincipal, **kwargs):
</span><span class="cx"> try:
</span><del>- removed = (yield removeProxy(rootResource, directory, store,
- principal, proxyPrincipal, **kwargs))
</del><ins>+ removed = (yield removeProxy(
+ rootResource, directory, store,
+ principal, proxyPrincipal, **kwargs
+ ))
</ins><span class="cx"> if removed:
</span><span class="cx"> print("Removed %s as a proxy for %s" % (
</span><span class="cx"> prettyPrincipal(proxyPrincipal),
</span><span class="lines">@@ -487,8 +491,12 @@
</span><span class="cx">
</span><span class="cx"> subPrincipal = proxySubprincipal(principal, proxyType)
</span><span class="cx"> if subPrincipal is None:
</span><del>- raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType,
- prettyPrincipal(principal)))
</del><ins>+ raise ProxyError(
+ "Unable to edit %s proxies for %s\n" % (
+ proxyType,
+ prettyPrincipal(principal)
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
</span><span class="cx">
</span><span class="lines">@@ -507,13 +515,15 @@
</span><span class="cx"> proxyTypes = ["read", "write"]
</span><span class="cx"> proxyTypes.remove(proxyType)
</span><span class="cx">
</span><del>- (yield action_removeProxyPrincipal(rootResource, directory, store,
- principal, proxyPrincipal, proxyTypes=proxyTypes))
</del><ins>+ yield action_removeProxyPrincipal(
+ rootResource, directory, store,
+ principal, proxyPrincipal, proxyTypes=proxyTypes
+ )
</ins><span class="cx">
</span><span class="cx"> # Schedule work the PeerConnectionPool will pick up as overdue
</span><span class="cx"> def groupPollNow(txn):
</span><span class="cx"> return GroupCacherPollingWork.reschedule(txn, 0, force=True)
</span><del>- yield store.inTransaction(groupPollNow)
</del><ins>+ yield store.inTransaction("addProxy groupPollNow", groupPollNow)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -526,8 +536,12 @@
</span><span class="cx">
</span><span class="cx"> subPrincipal = proxySubprincipal(principal, proxyType)
</span><span class="cx"> if subPrincipal is None:
</span><del>- raise ProxyError("Unable to edit %s proxies for %s\n" % (proxyType,
- prettyPrincipal(principal)))
</del><ins>+ raise ProxyError(
+ "Unable to edit %s proxies for %s\n" % (
+ proxyType,
+ prettyPrincipal(principal)
+ )
+ )
</ins><span class="cx">
</span><span class="cx"> membersProperty = (yield subPrincipal.readProperty(davxml.GroupMemberSet, None))
</span><span class="cx">
</span><span class="lines">@@ -549,7 +563,7 @@
</span><span class="cx"> # Schedule work the PeerConnectionPool will pick up as overdue
</span><span class="cx"> def groupPollNow(txn):
</span><span class="cx"> return GroupCacherPollingWork.reschedule(txn, 0, force=True)
</span><del>- yield store.inTransaction(groupPollNow)
</del><ins>+ yield store.inTransaction("removeProxy groupPollNow", groupPollNow)
</ins><span class="cx"> returnValue(removed)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimipdeliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py (13788 => 13789)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py 2014-07-24 16:02:02 UTC (rev 13788)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/delivery.py 2014-07-24 16:36:26 UTC (rev 13789)
</span><span class="lines">@@ -19,7 +19,6 @@
</span><span class="cx"> Handles the sending of scheduling messages via iMIP (mail gateway).
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from twext.enterprise.jobqueue import inTransaction
</del><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from txweb2 import responsecode
</span><span class="cx"> from txweb2.dav.http import ErrorResponse
</span><span class="lines">@@ -111,13 +110,14 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> def enqueueOp(txn):
</span><del>- return txn.enqueue(IMIPInvitationWork, fromAddr=fromAddr,
- toAddr=toAddr, icalendarText=caldata)
</del><ins>+ return txn.enqueue(
+ IMIPInvitationWork, fromAddr=fromAddr,
+ toAddr=toAddr, icalendarText=caldata
+ )
</ins><span class="cx">
</span><del>- yield inTransaction(
- lambda: self.scheduler.txn.store().newTransaction(
- "Submitting iMIP message for UID: {}".format(
- self.scheduler.calendar.resourceUID(),)),
</del><ins>+ yield self.scheduler.txn.store().inTransaction(
+ "Submitting iMIP message for UID: {}".format(
+ self.scheduler.calendar.resourceUID(),),
</ins><span class="cx"> enqueueOp
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_deliverypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py (13788 => 13789)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2014-07-24 16:02:02 UTC (rev 13788)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_delivery.py 2014-07-24 16:36:26 UTC (rev 13789)
</span><span class="lines">@@ -16,25 +16,39 @@
</span><span class="cx">
</span><span class="cx"> from txweb2 import responsecode
</span><span class="cx">
</span><del>-from twisted.internet.defer import inlineCallbacks
</del><ins>+from twisted.internet import reactor
+from twisted.internet.defer import inlineCallbacks, succeed
</ins><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><del>-from twistedcaldav.config import config
</del><span class="cx"> from twistedcaldav.ical import Component
</span><ins>+from twistedcaldav.stdconfig import config
</ins><span class="cx">
</span><del>-from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser
</del><ins>+from txdav.caldav.datastore.scheduling.cuaddress import RemoteCalendarUser, \
+ LocalCalendarUser
</ins><span class="cx"> from txdav.caldav.datastore.scheduling.imip.delivery import ScheduleViaIMip
</span><span class="cx"> from txdav.caldav.datastore.scheduling.itip import iTIPRequestStatus
</span><span class="cx"> from txdav.caldav.datastore.scheduling.scheduler import ScheduleResponseQueue
</span><ins>+from txdav.caldav.datastore.scheduling.imip.outbound import IMIPInvitationWork
+from txdav.common.datastore.test.util import CommonCommonTests
</ins><span class="cx">
</span><del>-class iMIPProcessing (unittest.TestCase):
</del><ins>+from twext.enterprise.jobqueue import JobItem
+
+class iMIPProcessing (CommonCommonTests, unittest.TestCase):
</ins><span class="cx"> """
</span><span class="cx"> iCalendar support tests
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def setUp(self):
+ super(iMIPProcessing, self).setUp()
+
+ yield self.buildStoreAndDirectory()
+
+
</ins><span class="cx"> class FakeSchedule(object):
</span><span class="cx">
</span><del>- def __init__(self, calendar):
</del><ins>+ def __init__(self, originator, calendar):
+ self.originator = originator
</ins><span class="cx"> self.calendar = calendar
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -51,13 +65,16 @@
</span><span class="cx"> DTEND:20080601T130000Z
</span><span class="cx"> ORGANIZER;CN="User 01":mailto:user1@example.com
</span><span class="cx"> ATTENDEE:mailto:user1@example.com
</span><del>-ATTENDEE:mailto:user2@example.com
</del><ins>+ATTENDEE:mailto:user2@example.org
</ins><span class="cx"> END:VFREEBUSY
</span><span class="cx"> END:VCALENDAR
</span><span class="cx"> """
</span><span class="cx">
</span><del>- scheduler = iMIPProcessing.FakeSchedule(Component.fromString(data))
- recipients = (RemoteCalendarUser("mailto:user1@example.com"),)
</del><ins>+ scheduler = iMIPProcessing.FakeSchedule(
+ LocalCalendarUser("mailto:user1@example.com", None),
+ Component.fromString(data)
+ )
+ recipients = (RemoteCalendarUser("mailto:user2@example.org"),)
</ins><span class="cx"> responses = ScheduleResponseQueue("REQUEST", responsecode.OK)
</span><span class="cx">
</span><span class="cx"> delivery = ScheduleViaIMip(scheduler, recipients, responses, True)
</span><span class="lines">@@ -68,6 +85,51 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_iMIP_delivery(self):
+
+ data = """BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REQUEST
+PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN
+BEGIN:VEVENT
+UID:12345-67890
+DTSTART:20080601T120000Z
+DTEND:20080601T130000Z
+ORGANIZER;CN="User 01":mailto:user1@example.com
+ATTENDEE:mailto:user1@example.com
+ATTENDEE:mailto:user2@example.org
+END:VEVENT
+END:VCALENDAR
+"""
+
+ results = []
+ class FakeSender(object):
+ def outbound(self, txn, fromAddr, toAddr, calendar):
+ results.append((fromAddr, toAddr))
+ return succeed(None)
+ self.patch(IMIPInvitationWork, "mailSender", FakeSender())
+
+ scheduler = iMIPProcessing.FakeSchedule(
+ LocalCalendarUser("mailto:user1@example.com", None),
+ Component.fromString(data)
+ )
+ scheduler.txn = self.transactionUnderTest()
+ recipients = (RemoteCalendarUser("mailto:user2@example.org"),)
+ responses = ScheduleResponseQueue("REQUEST", responsecode.OK)
+
+ delivery = ScheduleViaIMip(scheduler, recipients, responses, False)
+ yield delivery.generateSchedulingResponses()
+
+ self.assertEqual(len(responses.responses), 1)
+ self.assertEqual(str(responses.responses[0].reqstatus), iTIPRequestStatus.MESSAGE_SENT)
+
+ yield JobItem.waitEmpty(self.store.newTransaction, reactor, 60)
+
+ self.assertEqual(len(results), 1)
+ self.assertEqual(results[0], ("mailto:user1@example.com", "mailto:user2@example.org",))
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_matchCalendarUserAddress(self):
</span><span class="cx"> # iMIP not sensitive to case:
</span><span class="cx"> self.patch(config.Scheduling[ScheduleViaIMip.serviceType()], "AddressPatterns", ["mailto:.*"])
</span></span></pre>
</div>
</div>
</body>
</html>