[CalendarServer-changes] [13970] CalendarServer/trunk/bin/testserver

[source_changes at macosforge.org]

Revision: 13970
          http://trac.calendarserver.org//changeset/13970
Author:   sagen at apple.com
Date:     2014-09-17 10:07:30 -0700 (Wed, 17 Sep 2014)
Log Message:
-----------
Rather than sleep for a fixed amount of time, keep checking for the existence of a caldavd worker pid file.

Modified Paths:
--------------
    CalendarServer/trunk/bin/testserver

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- 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)
@@ -95,31 +95,40 @@
   rm -rf "${sandboxdir}"
 fi;
 
-mkdir -p "${sandboxdir}/Config" "${sandboxdir}/Data" "${sandboxdir}/Logs" "${sandboxdir}/Run"
+configdir="${sandboxdir}/Config"
+datadir="${sandboxdir}/Data"
 
-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"
+mkdir -p "${configdir}/Config" "${sandboxdir}/Logs" "${sandboxdir}/Run" "${datadir}/Documents"
 
+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"
+
 # Modify the plist
 
-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"
+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"
 
 # Start the server
 
-"${wd}/bin/run" -nd -c /tmp/cdt_server_sandbox/Config/caldavd-cdt.plist
+"${wd}/bin/run" -nd -c "${configdir}/caldavd-cdt.plist"
 
-echo "Waiting 10 seconds for server to start up"
-sleep 10
+/bin/echo -n "Waiting for server to start up..."
 
+while [ ! -f "${sandboxdir}/Run/caldav-instance-0.pid" ]; do
+  sleep 1
+  /bin/echo -n "."
+done;
 
+echo "Server has started"
+
 # Don't exit if testcaldav.py fails
 set +e
 
@@ -130,4 +139,4 @@
 cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
 
 echo "Stopping server"
-"${wd}/bin/run" -nk -c /tmp/cdt_server_sandbox/Config/caldavd-cdt.plist
+"${wd}/bin/run" -nk -c "${configdir}/caldavd-cdt.plist"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140917/912c55d7/attachment.html>