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

source_changes at macosforge.org source_changes at macosforge.org
Wed Sep 17 09:45:00 PDT 2014


Revision: 13969
          http://trac.calendarserver.org//changeset/13969
Author:   sagen at apple.com
Date:     2014-09-17 09:45:00 -0700 (Wed, 17 Sep 2014)
Log Message:
-----------
Fix testserver to always stop the calendar server at the end

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

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2014-09-17 02:20:09 UTC (rev 13968)
+++ CalendarServer/trunk/bin/testserver	2014-09-17 16:45:00 UTC (rev 13969)
@@ -119,13 +119,15 @@
 echo "Waiting 10 seconds for server to start up"
 sleep 10
 
+
+# Don't exit if testcaldav.py fails
+set +e
+
 # Run CDT
 
 echo "Starting CDT run"
+
 cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
 
-# Stop the server  -- FIXME:  if the CDT test fails, for some reason the
-# following lines don't execute...
-
 echo "Stopping server"
 "${wd}/bin/run" -nk -c /tmp/cdt_server_sandbox/Config/caldavd-cdt.plist
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140917/520551d1/attachment.html>


More information about the calendarserver-changes mailing list