<!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>[14692] 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/14692">14692</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-21 10:02:21 -0700 (Tue, 21 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>'bin/testserver -p' now runs pretests</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
<li><a href="#CalendarServertrunktwistedcaldavstdconfigpy">CalendarServer/trunk/twistedcaldav/stdconfig.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (14691 => 14692)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver 2015-04-21 00:00:56 UTC (rev 14691)
+++ CalendarServer/trunk/bin/testserver 2015-04-21 17:02:21 UTC (rev 14692)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> verbose="";
</span><span class="cx"> serverinfo="${cdt}/scripts/server/serverinfo.xml";
</span><ins>+ pretests="";
</ins><span class="cx"> printres="";
</span><span class="cx"> subdir="";
</span><span class="cx"> random="--random";
</span><span class="lines">@@ -49,6 +50,7 @@
</span><span class="cx"> echo " -d Set the script subdirectory";
</span><span class="cx"> echo " -h Print this help and exit";
</span><span class="cx"> echo " -o Execute tests in order";
</span><ins>+ echo " -p Run pretests";
</ins><span class="cx"> echo " -r Print request and response";
</span><span class="cx"> echo " -s Set the serverinfo.xml";
</span><span class="cx"> echo " -t Set the CalDAVTester directory";
</span><span class="lines">@@ -61,12 +63,13 @@
</span><span class="cx"> exit 64;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-while getopts 'Dhvrozt:s:d:x:' option; do
</del><ins>+while getopts 'Dhvprozt:s:d:x:' option; do
</ins><span class="cx"> case "$option" in
</span><span class="cx"> '?') usage; ;;
</span><span class="cx"> 'h') usage -; exit 0; ;;
</span><span class="cx"> 't') cdt="${OPTARG}"; serverinfo="${OPTARG}/scripts/server/serverinfo.xml"; ;;
</span><span class="cx"> 'd') subdir="--subdir=${OPTARG}"; ;;
</span><ins>+ 'p') pretests="--pretest CalDAV/pretest.xml"; ;;
</ins><span class="cx"> 's') serverinfo="${OPTARG}"; ;;
</span><span class="cx"> 'r') printres="--always-print-request --always-print-response"; ;;
</span><span class="cx"> 'v') verbose="v"; ;;
</span><span class="lines">@@ -139,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> echo "Starting CDT run"
</span><span class="cx">
</span><del>-cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} ${cdtdebug} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
</del><ins>+cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} ${cdtdebug} ${pretests} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
</ins><span class="cx">
</span><span class="cx"> # Capture exit status of testcaldav.py to use as this script's exit status.
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavstdconfigpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py (14691 => 14692)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-04-21 00:00:56 UTC (rev 14691)
+++ CalendarServer/trunk/twistedcaldav/stdconfig.py 2015-04-21 17:02:21 UTC (rev 14692)
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> # "VPOLL",
</span><span class="cx"> ],
</span><span class="cx">
</span><del>- "EnableTrashCollection": False, # Enable Trash Collection
</del><ins>+ "EnableTrashCollection": True, # Enable Trash Collection
</ins><span class="cx"> "ExposeTrashCollection": False, # Expose Trash Collection as a resource
</span><span class="cx">
</span><span class="cx"> "ParallelUpgrades": False, # Perform upgrades - currently only the
</span></span></pre>
</div>
</div>
</body>
</html>