<!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>[13970] CalendarServer/trunk/bin/testserver</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/13970">13970</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-09-17 10:07:30 -0700 (Wed, 17 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rather than sleep for a fixed amount of time, keep checking for the existence of a caldavd worker pid file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkbintestserver">CalendarServer/trunk/bin/testserver</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkbintestserver"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/bin/testserver (13969 => 13970)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/bin/testserver 2014-09-17 16:45:00 UTC (rev 13969)
+++ CalendarServer/trunk/bin/testserver 2014-09-17 17:07:30 UTC (rev 13970)
</span><span class="lines">@@ -95,31 +95,40 @@
</span><span class="cx"> rm -rf "${sandboxdir}"
</span><span class="cx"> fi;
</span><span class="cx">
</span><del>-mkdir -p "${sandboxdir}/Config" "${sandboxdir}/Data" "${sandboxdir}/Logs" "${sandboxdir}/Run"
</del><ins>+configdir="${sandboxdir}/Config"
+datadir="${sandboxdir}/Data"
</ins><span class="cx">
</span><del>-cp conf/caldavd-test.plist "${sandboxdir}/Config/caldavd-cdt.plist"
-cp conf/auth/proxies-test.xml "${sandboxdir}/Data/proxies-cdt.xml"
-cp conf/auth/resources-test.xml "${sandboxdir}/Data/resources-cdt.xml"
-cp conf/auth/augments-test.xml "${sandboxdir}/Data/augments-cdt.xml"
-cp conf/auth/accounts-test.xml "${sandboxdir}/Data/accounts-cdt.xml"
</del><ins>+mkdir -p "${configdir}/Config" "${sandboxdir}/Logs" "${sandboxdir}/Run" "${datadir}/Documents"
</ins><span class="cx">
</span><ins>+cp conf/caldavd-test.plist "${configdir}/caldavd-cdt.plist"
+cp conf/auth/proxies-test.xml "${datadir}/proxies-cdt.xml"
+cp conf/auth/resources-test.xml "${datadir}/resources-cdt.xml"
+cp conf/auth/augments-test.xml "${datadir}/augments-cdt.xml"
+cp conf/auth/accounts-test.xml "${datadir}/accounts-cdt.xml"
+
</ins><span class="cx"> # Modify the plist
</span><span class="cx">
</span><del>-plutil -replace ServerRoot -string "${sandboxdir}" "${sandboxdir}/Config/caldavd-cdt.plist"
-plutil -replace ConfigRoot -string "Config" "${sandboxdir}/Config/caldavd-cdt.plist"
-plutil -replace ProxyLoadFromFile -string "${sandboxdir}/Data/proxies-cdt.xml" "${sandboxdir}/Config/caldavd-cdt.plist"
-plutil -replace ResourceService.params.xmlFile -string "${sandboxdir}/Data/resources-cdt.xml" "${sandboxdir}/Config/caldavd-cdt.plist"
-plutil -replace DirectoryService.params.xmlFile -string "${sandboxdir}/Data/accounts-cdt.xml" "${sandboxdir}/Config/caldavd-cdt.plist"
-plutil -replace AugmentService.params.xmlFile -xml "<array><string>${sandboxdir}/Data/augments-cdt.xml</string></array>" "${sandboxdir}/Config/caldavd-cdt.plist"
</del><ins>+plutil -replace ServerRoot -string "${sandboxdir}" "${configdir}/caldavd-cdt.plist"
+plutil -replace ConfigRoot -string "Config" "${configdir}/caldavd-cdt.plist"
+plutil -replace RunRoot -string "Run" "${configdir}/caldavd-cdt.plist"
+plutil -replace ProxyLoadFromFile -string "${datadir}/proxies-cdt.xml" "${configdir}/caldavd-cdt.plist"
+plutil -replace ResourceService.params.xmlFile -string "${datadir}/resources-cdt.xml" "${configdir}/caldavd-cdt.plist"
+plutil -replace DirectoryService.params.xmlFile -string "${datadir}/accounts-cdt.xml" "${configdir}/caldavd-cdt.plist"
+plutil -replace AugmentService.params.xmlFile -xml "<array><string>${datadir}/augments-cdt.xml</string></array>" "${configdir}/caldavd-cdt.plist"
</ins><span class="cx">
</span><span class="cx"> # Start the server
</span><span class="cx">
</span><del>-"${wd}/bin/run" -nd -c /tmp/cdt_server_sandbox/Config/caldavd-cdt.plist
</del><ins>+"${wd}/bin/run" -nd -c "${configdir}/caldavd-cdt.plist"
</ins><span class="cx">
</span><del>-echo "Waiting 10 seconds for server to start up"
-sleep 10
</del><ins>+/bin/echo -n "Waiting for server to start up..."
</ins><span class="cx">
</span><ins>+while [ ! -f "${sandboxdir}/Run/caldav-instance-0.pid" ]; do
+ sleep 1
+ /bin/echo -n "."
+done;
</ins><span class="cx">
</span><ins>+echo "Server has started"
+
</ins><span class="cx"> # Don't exit if testcaldav.py fails
</span><span class="cx"> set +e
</span><span class="cx">
</span><span class="lines">@@ -130,4 +139,4 @@
</span><span class="cx"> cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
</span><span class="cx">
</span><span class="cx"> echo "Stopping server"
</span><del>-"${wd}/bin/run" -nk -c /tmp/cdt_server_sandbox/Config/caldavd-cdt.plist
</del><ins>+"${wd}/bin/run" -nk -c "${configdir}/caldavd-cdt.plist"
</ins></span></pre>
</div>
</div>
</body>
</html>