[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [15443] CalDAVTester/trunk
From: source_changes () macosforge ! org
Date: 2016-01-23 18:33:22
Message-ID: 20160123183322.9DE65140E86 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 15443
http://trac.calendarserver.org//changeset/15443
Author: cdaboo@apple.com
Date: 2016-01-23 10:33:22 -0800 (Sat, 23 Jan 2016)
Log Message:
-----------
Tweaks to better support running tests for another type of server.
Modified Paths:
--------------
CalDAVTester/trunk/README.txt
CalDAVTester/trunk/src/manager.py
CalDAVTester/trunk/src/serverinfo.py
CalDAVTester/trunk/verifiers/dataString.py
Modified: CalDAVTester/trunk/README.txt
===================================================================
--- CalDAVTester/trunk/README.txt 2016-01-22 21:22:35 UTC (rev 15442)
+++ CalDAVTester/trunk/README.txt 2016-01-23 18:33:22 UTC (rev 15443)
@@ -398,11 +398,18 @@
ELEMENT <value>
values for the argument.
- ELEMENT <graburi>
- if present, this stores the value of the actual request URI
- used in a named variable which can be used in subsequent requests.
- Useful for capturing URIs when the GETNEW method is used.
-
+ ELEMENT <graburi>
+ if present, this stores the value of the actual request URI
+ used in a named variable which can be used in subsequent requests.
+ Useful for capturing URIs when the GETNEW method is used.
+
+ ELEMENT <grabcount>
+ if present, this stores the number of child responses in a
+ {DAV:}multistatus response into the named variable which
+ can be used in subsequent requests. This is useful for
+ capturing the current count so that a change in the count
+ can be tested for later.
+
ELEMENT <grabheader>
if present, this stores the value of the specified header
returned in the response in a named variable which can be used
@@ -413,11 +420,16 @@
returned in a PROPFIND response in a named variable which can
be used in subsequent requests.
- ELEMENT <grabelement>
- if present, this stores the text representation of an XML
- element extracted from the response body in a named variable
- which can be used in subsequent requests.
-
+ ELEMENT <grabelement>
+ if present, this stores the text representation of an XML
+ element extracted from the response body in a named variable
+ which can be used in subsequent requests.
+
+ ELEMENT <grabjson>
+ if present, this stores the text representation of a JSON
+ object extracted from the response body in a named variable
+ which can be used in subsequent requests.
+
ELEMENT <grabcalproperty>
if present, this stores a calendar property value in a named
variable which can be used in subsequent request. The syntax for
@@ -498,9 +510,12 @@
Performs a check of response body tries to find occurrences of the specified strings or the
absence of specified strings.
- Argument: 'contains'
- One or more strings that must be contained in the data (case-sensitive).
-
+ Argument: 'equals'
+ One or more strings that must match exactly in the data (case-sensitive).
+
+ Argument: 'contains'
+ One or more strings that must be contained in the data (case-sensitive).
+
Argument: 'notcontains'
One or more strings that must not be contained in the data (case-sensitive).
@@ -598,7 +613,7 @@
string value can be checked by append "~$" and the string value to test
to the JSON pointer value. A single "." can be used as a reference-token
in the JSON pointer to match against any member or array item at that
- poisition in the document.
+ position in the document.
Argument: 'exists'
JSON pointer for a JSON item to check the presence of
@@ -711,8 +726,8 @@
whether the returned properties (and optionally their values) are good (2xx) or bad
(non-2xx) response code. The overall response status must be 207.
- Argument: 'roor-element'
- Exepected root element for the XML response. Normally this is DAV:multistatus
+ Argument: 'root-element'
+ Expected root element for the XML response. Normally this is DAV:multistatus
but, e.g., MKCOL ext uses a different root, but mostly looks like multistatus
otherwise.
@@ -819,7 +834,7 @@
Any specified XML elements will have their content removed from the
response XML data before the comparison with the file data is done.
This can be used to ignore element values that change in each request,
- e.g., a timestamp.
+ e.g., a time stamp.
Example:
Modified: CalDAVTester/trunk/src/manager.py
===================================================================
--- CalDAVTester/trunk/src/manager.py 2016-01-22 21:22:35 UTC (rev 15442)
+++ CalDAVTester/trunk/src/manager.py 2016-01-23 18:33:22 UTC (rev 15443)
@@ -47,6 +47,7 @@
def __init__(self, text=True):
self.server_info = serverinfo()
+ self.base_dir = ""
self.data_dir = None
self.pretest = None
self.posttest = None
@@ -199,6 +200,8 @@
raise EX_INVALID_CONFIG_FILE
self.message("Reading Test Details from \"{f}\"".format(f=fname))
+ if self.base_dir:
+ fname = fname[len(self.base_dir) + 1:]
test = caldavtest(self, fname)
test.parseXML(caldavtest_node)
return test
@@ -226,7 +229,6 @@
def readCommandLine(self):
sname = "scripts/server/serverinfo.xml"
dname = "scripts/tests"
- basedir = None
fnames = []
ssl = False
all = False
@@ -272,13 +274,13 @@
elif option == "--all":
all = True
elif option == "--basedir":
- basedir = value
- sname = os.path.join(basedir, "serverinfo.xml")
- dname = os.path.join(basedir, "tests")
- self.data_dir = os.path.join(basedir, "data")
+ self.base_dir = value
+ sname = os.path.join(self.base_dir, "serverinfo.xml")
+ dname = os.path.join(self.base_dir, "tests")
+ self.data_dir = os.path.join(self.base_dir, "data")
# Also add parent to PYTHON path
- sys.path.append(os.path.dirname(basedir))
+ sys.path.append(os.path.dirname(self.base_dir))
elif option == "--subdir":
subdir = value + "/"
Modified: CalDAVTester/trunk/src/serverinfo.py
===================================================================
--- CalDAVTester/trunk/src/serverinfo.py 2016-01-22 21:22:35 UTC (rev 15442)
+++ CalDAVTester/trunk/src/serverinfo.py 2016-01-23 18:33:22 UTC (rev 15443)
@@ -13,7 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
##
-from uuid import uuid4
"""
Class that encapsulates the server information for a CalDAV test run.
@@ -22,6 +21,8 @@
import datetime
import re
import src.xmlDefs
+from uuid import uuid4
+from urlparse import urlparse
class serverinfo(object):
@@ -147,6 +148,12 @@
if variable.startswith("basename("):
variable = variable[len("basename("):-1]
value = value.rstrip("/").split("/")[-1]
+
+ # urlpath() - extract just the URL path segment from the value
+ elif variable.startswith("urlpath("):
+ variable = variable[len("urlpath("):-1]
+ value = urlparse(value).path
+
processed[variable] = value
self.addsubs(processed, self.extrasubsdict)
Modified: CalDAVTester/trunk/verifiers/dataString.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataString.py 2016-01-22 21:22:35 UTC (rev 15442)
+++ CalDAVTester/trunk/verifiers/dataString.py 2016-01-23 18:33:22 UTC (rev 15443)
@@ -22,6 +22,7 @@
def verify(self, manager, uri, response, respdata, args): #@UnusedVariable
# Get arguments
+ equals = args.get("equals", [])
contains = args.get("contains", [])
notcontains = args.get("notcontains", [])
unwrap = args.get("unwrap")
@@ -44,6 +45,10 @@
else:
newrespdata = respdata
# Check each contains and not-contains (AND operation)
+ for item in equals:
+ item = manager.server_info.subs(item)
+ if newrespdata != item:
+ return False, " Response data does not equal \"%s\"" % (item,)
for item in contains:
item = manager.server_info.subs(item)
if newrespdata.find(item.replace("\n", "\r\n")) == -1 and newrespdata.find(item) == -1:
[Attachment #5 (text/html)]
<!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>[15443] 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/15443">15443</a></dd> <dt>Author</dt> \
<dd>cdaboo@apple.com</dd> <dt>Date</dt> <dd>2016-01-23 10:33:22 -0800 (Sat, 23 Jan \
2016)</dd> </dl>
<h3>Log Message</h3>
<pre>Tweaks to better support running tests for another type of server.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalDAVTestertrunkREADMEtxt">CalDAVTester/trunk/README.txt</a></li>
<li><a href="#CalDAVTestertrunksrcmanagerpy">CalDAVTester/trunk/src/manager.py</a></li>
<li><a href="#CalDAVTestertrunksrcserverinfopy">CalDAVTester/trunk/src/serverinfo.py</a></li>
<li><a href="#CalDAVTestertrunkverifiersdataStringpy">CalDAVTester/trunk/verifiers/dataString.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalDAVTestertrunkREADMEtxt"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/README.txt (15442 => \
15443)</h4> <pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/README.txt 2016-01-22 21:22:35 UTC (rev \
15442)
+++ CalDAVTester/trunk/README.txt 2016-01-23 18:33:22 UTC (rev 15443)
</span><span class="lines">@@ -398,11 +398,18 @@
</span><span class="cx"> ELEMENT <value>
</span><span class="cx"> values for the argument.
</span><span class="cx">
</span><del>- ELEMENT <graburi>
- if present, this stores the value of the actual request URI
- used in a named variable which can be used in subsequent requests.
- Useful for capturing URIs when the GETNEW method is used.
-
</del><ins>+ ELEMENT <graburi>
+ if present, this stores the value of the actual request URI
+ used in a named variable which can be used in subsequent requests.
+ Useful for capturing URIs when the GETNEW method is used.
+
+ ELEMENT <grabcount>
+ if present, this stores the number of child responses in a
+ {DAV:}multistatus response into the named variable which
+ can be used in subsequent requests. This is useful for
+ capturing the current count so that a change in the count
+ can be tested for later.
+
</ins><span class="cx"> ELEMENT <grabheader>
</span><span class="cx"> if present, this stores the value of the specified header
</span><span class="cx"> returned in the response in a named variable which can be \
used </span><span class="lines">@@ -413,11 +420,16 @@
</span><span class="cx"> returned in a PROPFIND response in a named variable which \
can </span><span class="cx"> be used in subsequent requests.
</span><span class="cx">
</span><del>- ELEMENT <grabelement>
- if present, this stores the text representation of an XML
- element extracted from the response body in a named variable
- which can be used in subsequent requests.
-
</del><ins>+ ELEMENT <grabelement>
+ if present, this stores the text representation of an XML
+ element extracted from the response body in a named variable
+ which can be used in subsequent requests.
+
+ ELEMENT <grabjson>
+ if present, this stores the text representation of a JSON
+ object extracted from the response body in a named variable
+ which can be used in subsequent requests.
+
</ins><span class="cx"> ELEMENT <grabcalproperty>
</span><span class="cx"> if present, this stores a calendar property value in a \
named </span><span class="cx"> variable which can be used in subsequent request. \
The syntax for </span><span class="lines">@@ -498,9 +510,12 @@
</span><span class="cx"> Performs a check of response body tries to find occurrences \
of the specified strings or the </span><span class="cx"> absence of specified \
strings. </span><span class="cx">
</span><del>- Argument: 'contains'
- One or more strings that must be contained in the data (case-sensitive).
-
</del><ins>+ Argument: 'equals'
+ One or more strings that must match exactly in the data (case-sensitive).
+
+ Argument: 'contains'
+ One or more strings that must be contained in the data (case-sensitive).
+
</ins><span class="cx"> Argument: 'notcontains'
</span><span class="cx"> One or more strings that must not be contained in the data \
(case-sensitive). </span><span class="cx">
</span><span class="lines">@@ -598,7 +613,7 @@
</span><span class="cx"> string value can be checked by append "~$" and \
the string value to test </span><span class="cx"> to the JSON pointer value. A \
single "." can be used as a reference-token </span><span class="cx"> in \
the JSON pointer to match against any member or array item at that \
</span><del>- poisition in the document. </del><ins>+ position in the document.
</ins><span class="cx">
</span><span class="cx"> Argument: 'exists'
</span><span class="cx"> JSON pointer for a JSON item to check the presence of
</span><span class="lines">@@ -711,8 +726,8 @@
</span><span class="cx"> whether the returned properties (and optionally their \
values) are good (2xx) or bad </span><span class="cx"> (non-2xx) response code. The \
overall response status must be 207. </span><span class="cx">
</span><del>- Argument: 'roor-element'
- Exepected root element for the XML response. Normally this is DAV:multistatus
</del><ins>+ Argument: 'root-element'
+ Expected root element for the XML response. Normally this is DAV:multistatus
</ins><span class="cx"> but, e.g., MKCOL ext uses a different root, but mostly \
looks like multistatus </span><span class="cx"> otherwise.
</span><span class="cx">
</span><span class="lines">@@ -819,7 +834,7 @@
</span><span class="cx"> Any specified XML elements will have their content removed \
from the </span><span class="cx"> response XML data before the comparison with the \
file data is done. </span><span class="cx"> This can be used to ignore element \
values that change in each request, </span><del>- e.g., a timestamp.
</del><ins>+ e.g., a time stamp.
</ins><span class="cx">
</span><span class="cx"> Example:
</span><span class="cx">
</span></span></pre></div>
<a id="CalDAVTestertrunksrcmanagerpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/manager.py (15442 => \
15443)</h4> <pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/manager.py 2016-01-22 21:22:35 UTC (rev \
15442)
+++ CalDAVTester/trunk/src/manager.py 2016-01-23 18:33:22 UTC (rev 15443)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx">
</span><span class="cx"> def __init__(self, text=True):
</span><span class="cx"> self.server_info = serverinfo()
</span><ins>+ self.base_dir = ""
</ins><span class="cx"> self.data_dir = None
</span><span class="cx"> self.pretest = None
</span><span class="cx"> self.posttest = None
</span><span class="lines">@@ -199,6 +200,8 @@
</span><span class="cx"> raise EX_INVALID_CONFIG_FILE
</span><span class="cx">
</span><span class="cx"> self.message("Reading Test Details from \
\"{f}\"".format(f=fname)) </span><ins>+ if self.base_dir:
+ fname = fname[len(self.base_dir) + 1:]
</ins><span class="cx"> test = caldavtest(self, fname)
</span><span class="cx"> test.parseXML(caldavtest_node)
</span><span class="cx"> return test
</span><span class="lines">@@ -226,7 +229,6 @@
</span><span class="cx"> def readCommandLine(self):
</span><span class="cx"> sname = "scripts/server/serverinfo.xml"
</span><span class="cx"> dname = "scripts/tests"
</span><del>- basedir = None
</del><span class="cx"> fnames = []
</span><span class="cx"> ssl = False
</span><span class="cx"> all = False
</span><span class="lines">@@ -272,13 +274,13 @@
</span><span class="cx"> elif option == "--all":
</span><span class="cx"> all = True
</span><span class="cx"> elif option == "--basedir":
</span><del>- basedir = value
- sname = os.path.join(basedir, "serverinfo.xml")
- dname = os.path.join(basedir, "tests")
- self.data_dir = os.path.join(basedir, "data")
</del><ins>+ self.base_dir = value
+ sname = os.path.join(self.base_dir, "serverinfo.xml")
+ dname = os.path.join(self.base_dir, "tests")
+ self.data_dir = os.path.join(self.base_dir, "data")
</ins><span class="cx">
</span><span class="cx"> # Also add parent to PYTHON path
</span><del>- sys.path.append(os.path.dirname(basedir))
</del><ins>+ sys.path.append(os.path.dirname(self.base_dir))
</ins><span class="cx">
</span><span class="cx"> elif option == "--subdir":
</span><span class="cx"> subdir = value + "/"
</span></span></pre></div>
<a id="CalDAVTestertrunksrcserverinfopy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/src/serverinfo.py (15442 => \
15443)</h4> <pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/src/serverinfo.py 2016-01-22 21:22:35 UTC \
(rev 15442)
+++ CalDAVTester/trunk/src/serverinfo.py 2016-01-23 18:33:22 UTC (rev 15443)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> # See the License for the specific language governing \
permissions and </span><span class="cx"> # limitations under the License.
</span><span class="cx"> ##
</span><del>-from uuid import uuid4
</del><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> Class that encapsulates the server information for a CalDAV \
test run. </span><span class="lines">@@ -22,6 +21,8 @@
</span><span class="cx"> import datetime
</span><span class="cx"> import re
</span><span class="cx"> import src.xmlDefs
</span><ins>+from uuid import uuid4
+from urlparse import urlparse
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class serverinfo(object):
</span><span class="lines">@@ -147,6 +148,12 @@
</span><span class="cx"> if variable.startswith("basename("):
</span><span class="cx"> variable = \
variable[len("basename("):-1] </span><span class="cx"> \
value = value.rstrip("/").split("/")[-1] </span><ins>+
+ # urlpath() - extract just the URL path segment from the value
+ elif variable.startswith("urlpath("):
+ variable = variable[len("urlpath("):-1]
+ value = urlparse(value).path
+
</ins><span class="cx"> processed[variable] = value
</span><span class="cx">
</span><span class="cx"> self.addsubs(processed, self.extrasubsdict)
</span></span></pre></div>
<a id="CalDAVTestertrunkverifiersdataStringpy"></a>
<div class="modfile"><h4>Modified: CalDAVTester/trunk/verifiers/dataString.py (15442 \
=> 15443)</h4> <pre class="diff"><span>
<span class="info">--- CalDAVTester/trunk/verifiers/dataString.py 2016-01-22 21:22:35 \
UTC (rev 15442)
+++ CalDAVTester/trunk/verifiers/dataString.py 2016-01-23 18:33:22 UTC (rev 15443)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> def verify(self, manager, uri, response, respdata, \
args): #@UnusedVariable </span><span class="cx"> # Get arguments
</span><ins>+ equals = args.get("equals", [])
</ins><span class="cx"> contains = args.get("contains", [])
</span><span class="cx"> notcontains = args.get("notcontains", [])
</span><span class="cx"> unwrap = args.get("unwrap")
</span><span class="lines">@@ -44,6 +45,10 @@
</span><span class="cx"> else:
</span><span class="cx"> newrespdata = respdata
</span><span class="cx"> # Check each contains and not-contains (AND \
operation) </span><ins>+ for item in equals:
+ item = manager.server_info.subs(item)
+ if newrespdata != item:
+ return False, " Response data does not equal \
\"%s\"" % (item,) </ins><span class="cx"> for item in \
contains: </span><span class="cx"> item = manager.server_info.subs(item)
</span><span class="cx"> if newrespdata.find(item.replace("\n", \
"\r\n")) == -1 and newrespdata.find(item) == -1: </span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic