<!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>[14711] CalDAVTester/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/14711">14711</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-27 08:10:42 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make sure pseudo-requests use the right host/port for from the original request. Clean-up properly after a sharing test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkscriptstestspodCalDAVsharingreportsqueryxml">CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml</a></li>
<li><a href="#CalDAVTestertrunksrccaldavtestpy">CalDAVTester/trunk/src/caldavtest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkscriptstestspodCalDAVsharingreportsqueryxml"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml (14710 => 14711)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml 2015-04-24 20:56:47 UTC (rev 14710)
+++ CalDAVTester/trunk/scripts/tests-pod/CalDAV/sharing-reports-query.xml 2015-04-27 15:10:42 UTC (rev 14711)
</span><span class="lines">@@ -2984,6 +2984,15 @@
</span><span class="cx"> </test>
</span><span class="cx"> </test-suite>
</span><span class="cx">
</span><del>- <end/>
</del><ins>+ <end>
+ <request user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$notificationpath1:/</ruri>
+ </request>
+ <request host2="yes" user="$useradmin:" pswd="$pswdadmin:">
+ <method>DELETEALL</method>
+ <ruri>$pnotificationpath2:/</ruri>
+ </request>
+ </end>
</ins><span class="cx">
</span><span class="cx"> </caldavtest>
</span></span></pre></div>
<a id="CalDAVTestertrunksrccaldavtestpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/caldavtest.py (14710 => 14711)</h4>
<pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/caldavtest.py 2015-04-24 20:56:47 UTC (rev 14710)
+++ CalDAVTester/trunk/src/caldavtest.py 2015-04-27 15:10:42 UTC (rev 14711)
</span><span class="lines">@@ -259,9 +259,11 @@
</span><span class="cx"> return result
</span><span class="cx">
</span><span class="cx">
</span><del>- def doget(self, resource, label=""):
</del><ins>+ def doget(self, original_request, resource, label=""):
</ins><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "GET"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(resource[0])
</span><span class="cx"> req.ruri = resource[0]
</span><span class="cx"> if len(resource[1]):
</span><span class="lines">@@ -275,10 +277,12 @@
</span><span class="cx"> return True, respdata
</span><span class="cx">
</span><span class="cx">
</span><del>- def dofindall(self, collection, label=""):
</del><ins>+ def dofindall(self, original_request, collection, label=""):
</ins><span class="cx"> hrefs = []
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "PROPFIND"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(collection[0])
</span><span class="cx"> req.ruri = collection[0]
</span><span class="cx"> req.headers["Depth"] = "1"
</span><span class="lines">@@ -315,12 +319,14 @@
</span><span class="cx"> return hrefs
</span><span class="cx">
</span><span class="cx">
</span><del>- def dodeleteall(self, deletes, label=""):
</del><ins>+ def dodeleteall(self, original_request, deletes, label=""):
</ins><span class="cx"> if len(deletes) == 0:
</span><span class="cx"> return True
</span><span class="cx"> for deleter in deletes:
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "DELETE"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(deleter[0])
</span><span class="cx"> req.ruri = deleter[0]
</span><span class="cx"> if len(deleter[1]):
</span><span class="lines">@@ -334,7 +340,7 @@
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="cx">
</span><del>- def dofindnew(self, collection, label="", other=False):
</del><ins>+ def dofindnew(self, original_request, collection, label="", other=False):
</ins><span class="cx"> hresult = ""
</span><span class="cx">
</span><span class="cx"> uri = collection[0]
</span><span class="lines">@@ -347,6 +353,8 @@
</span><span class="cx"> possible_matches = set()
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "PROPFIND"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(uri)
</span><span class="cx"> req.ruri = uri
</span><span class="cx"> req.headers["Depth"] = "1"
</span><span class="lines">@@ -427,12 +435,14 @@
</span><span class="cx"> return hresult
</span><span class="cx">
</span><span class="cx">
</span><del>- def dowaitcount(self, collection, count, label=""):
</del><ins>+ def dowaitcount(self, original_request, collection, count, label=""):
</ins><span class="cx">
</span><span class="cx"> hrefs = []
</span><span class="cx"> for _ignore in range(self.manager.server_info.waitcount):
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "PROPFIND"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(collection[0])
</span><span class="cx"> req.ruri = collection[0]
</span><span class="cx"> req.headers["Depth"] = "1"
</span><span class="lines">@@ -470,7 +480,7 @@
</span><span class="cx"> # Get the content of each resource
</span><span class="cx"> rdata = ""
</span><span class="cx"> for href in hrefs:
</span><del>- result, respdata = self.doget((href, collection[1], collection[2],), label)
</del><ins>+ result, respdata = self.doget(req, (href, collection[1], collection[2],), label)
</ins><span class="cx"> test = "unknown"
</span><span class="cx"> if respdata.startswith("BEGIN:VCALENDAR"):
</span><span class="cx"> uid = respdata.find("UID:")
</span><span class="lines">@@ -484,11 +494,13 @@
</span><span class="cx"> return False, len(hrefs)
</span><span class="cx">
</span><span class="cx">
</span><del>- def dowaitchanged(self, uri, etag, user, pswd, label=""):
</del><ins>+ def dowaitchanged(self, original_request, uri, etag, user, pswd, label=""):
</ins><span class="cx">
</span><span class="cx"> for _ignore in range(self.manager.server_info.waitcount):
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "HEAD"
</span><ins>+ req.host = original_request.host
+ req.port = original_request.port
</ins><span class="cx"> req.ruris.append(uri)
</span><span class="cx"> req.ruri = uri
</span><span class="cx"> if user:
</span><span class="lines">@@ -522,6 +534,8 @@
</span><span class="cx"> for deleter in self.end_deletes:
</span><span class="cx"> req = request(self.manager)
</span><span class="cx"> req.method = "DELETE"
</span><ins>+ req.host = deleter[3]
+ req.port = deleter[4]
</ins><span class="cx"> req.ruris.append(deleter[0])
</span><span class="cx"> req.ruri = deleter[0]
</span><span class="cx"> if len(deleter[1]):
</span><span class="lines">@@ -551,8 +565,8 @@
</span><span class="cx"> if req.method == "DELETEALL":
</span><span class="cx"> for ruri in req.ruris:
</span><span class="cx"> collection = (ruri, req.user, req.pswd)
</span><del>- hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
- if not self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL")):
</del><ins>+ hrefs = self.dofindall(req, collection, label="%s | %s" % (label, "DELETEALL"))
+ if not self.dodeleteall(req, hrefs, label="%s | %s" % (label, "DELETEALL")):
</ins><span class="cx"> return False, "DELETEALL failed for: {r}".format(r=ruri), None, None
</span><span class="cx"> return True, "", None, None
</span><span class="cx">
</span><span class="lines">@@ -568,7 +582,7 @@
</span><span class="cx"> # Special for GETNEW
</span><span class="cx"> elif req.method == "GETNEW":
</span><span class="cx"> collection = (req.ruri, req.user, req.pswd)
</span><del>- self.grabbedlocation = self.dofindnew(collection, label=label)
</del><ins>+ self.grabbedlocation = self.dofindnew(req, collection, label=label)
</ins><span class="cx"> if req.graburi:
</span><span class="cx"> self.manager.server_info.addextrasubs({req.graburi: self.grabbedlocation})
</span><span class="cx"> req.method = "GET"
</span><span class="lines">@@ -577,7 +591,7 @@
</span><span class="cx"> # Special for FINDNEW
</span><span class="cx"> elif req.method == "FINDNEW":
</span><span class="cx"> collection = (req.ruri, req.user, req.pswd)
</span><del>- self.grabbedlocation = self.dofindnew(collection, label=label)
</del><ins>+ self.grabbedlocation = self.dofindnew(req, collection, label=label)
</ins><span class="cx"> if req.graburi:
</span><span class="cx"> self.manager.server_info.addextrasubs({req.graburi: self.grabbedlocation})
</span><span class="cx"> return True, "", None, None
</span><span class="lines">@@ -585,7 +599,7 @@
</span><span class="cx"> # Special for GETOTHER
</span><span class="cx"> elif req.method == "GETOTHER":
</span><span class="cx"> collection = (req.ruri, req.user, req.pswd)
</span><del>- self.grabbedlocation = self.dofindnew(collection, label=label, other=True)
</del><ins>+ self.grabbedlocation = self.dofindnew(req, collection, label=label, other=True)
</ins><span class="cx"> if req.graburi:
</span><span class="cx"> self.manager.server_info.addextrasubs({req.graburi: self.grabbedlocation})
</span><span class="cx"> req.method = "GET"
</span><span class="lines">@@ -596,7 +610,7 @@
</span><span class="cx"> count = int(req.method[10:])
</span><span class="cx"> for ruri in req.ruris:
</span><span class="cx"> collection = (ruri, req.user, req.pswd)
</span><del>- waitresult, waitdetails = self.dowaitcount(collection, count, label=label)
</del><ins>+ waitresult, waitdetails = self.dowaitcount(req, collection, count, label=label)
</ins><span class="cx"> if not waitresult:
</span><span class="cx"> return False, "Count did not change: {w}".format(w=waitdetails), None, None
</span><span class="cx"> else:
</span><span class="lines">@@ -607,10 +621,10 @@
</span><span class="cx"> count = int(req.method[len("WAITDELETEALL"):])
</span><span class="cx"> for ruri in req.ruris:
</span><span class="cx"> collection = (ruri, req.user, req.pswd)
</span><del>- waitresult, waitdetails = self.dowaitcount(collection, count, label=label)
</del><ins>+ waitresult, waitdetails = self.dowaitcount(req, collection, count, label=label)
</ins><span class="cx"> if waitresult:
</span><del>- hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
- self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL"))
</del><ins>+ hrefs = self.dofindall(req, collection, label="%s | %s" % (label, "DELETEALL"))
+ self.dodeleteall(req, hrefs, label="%s | %s" % (label, "DELETEALL"))
</ins><span class="cx"> else:
</span><span class="cx"> return False, "Count did not change: {w}".format(w=waitdetails), None, None
</span><span class="cx"> else:
</span><span class="lines">@@ -630,7 +644,7 @@
</span><span class="cx">
</span><span class="cx"> # Cache delayed delete
</span><span class="cx"> if req.end_delete:
</span><del>- self.end_deletes.append((uri, req.user, req.pswd))
</del><ins>+ self.end_deletes.append((uri, req.user, req.pswd, req.host, req.port,))
</ins><span class="cx">
</span><span class="cx"> if details:
</span><span class="cx"> resulttxt += " %s: %s\n" % (method, uri)
</span><span class="lines">@@ -638,6 +652,7 @@
</span><span class="cx"> # Special for GETCHANGED
</span><span class="cx"> if req.method == "GETCHANGED":
</span><span class="cx"> if not self.dowaitchanged(
</span><ins>+ req,
</ins><span class="cx"> uri, etags[uri], req.user, req.pswd,
</span><span class="cx"> label=label
</span><span class="cx"> ):
</span></span></pre>
</div>
</div>
</body>
</html>