<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[1455] CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.
 test_acl.patch</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/1455">1455</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2007-04-05 14:21:47 -0700 (Thu, 05 Apr 2007)</dd>
</dl>

<h3>Log Message</h3>
<pre>Tweak test for CalendarServer's re-org of how reports privileges are checked.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunklibpatchesTwistedtwistedweb2davtesttest_aclpatch">CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunklibpatchesTwistedtwistedweb2davtesttest_aclpatch"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch (1454 => 1455)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch        2007-04-05 21:13:24 UTC (rev 1454)
+++ CalendarServer/trunk/lib-patches/Twisted/twisted.web2.dav.test.test_acl.patch        2007-04-05 21:21:47 UTC (rev 1455)
</span><span class="lines">@@ -82,3 +82,22 @@
</span><span class="cx">          for name, acl in (
</span><span class="cx">              (&quot;none&quot;       , self.grant()),
</span><span class="cx">              (&quot;read&quot;       , self.grant(davxml.Read())),
</span><ins>+@@ -363,7 +378,7 @@
+                 elif method == &quot;REPORT&quot;:
+                     # BAD_REQUEST in the allowed case, because we're not actually
+                     # including the required XML in the request body.
+-                    ok = responsecode.BAD_REQUEST
++                    ok = responsecode.MULTI_STATUS
+                 else:
+                     raise AssertionError(&quot;We shouldn't be here.  (method = %r)&quot; % (method,))

+@@ -377,6 +392,9 @@
+                     path = os.path.join(self.docroot, name)

+                     request = SimpleRequest(self.site, method, &quot;/&quot; + name)
++                    if method == &quot;REPORT&quot;:
++                        request.stream = MemoryStream(davxml.PrincipalPropertySearch().toxml())
++
+                     _add_auth_header(request)

+                     def test(response, code=code, path=path):
</ins></span></pre>
</div>
</div>

</body>
</html>