[CalendarServer-changes] [14692] CalendarServer/trunk

source_changes at macosforge.org source_changes at macosforge.org
Tue Apr 21 10:02:22 PDT 2015


Revision: 14692
          http://trac.calendarserver.org//changeset/14692
Author:   sagen at apple.com
Date:     2015-04-21 10:02:21 -0700 (Tue, 21 Apr 2015)
Log Message:
-----------
'bin/testserver -p' now runs pretests

Modified Paths:
--------------
    CalendarServer/trunk/bin/testserver
    CalendarServer/trunk/twistedcaldav/stdconfig.py

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- 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)
@@ -34,6 +34,7 @@
 
    verbose="";
 serverinfo="${cdt}/scripts/server/serverinfo.xml";
+  pretests="";
   printres="";
     subdir="";
     random="--random";
@@ -49,6 +50,7 @@
   echo "        -d  Set the script subdirectory";
   echo "        -h  Print this help and exit";
   echo "        -o  Execute tests in order";
+  echo "        -p  Run pretests";
   echo "        -r  Print request and response";
   echo "        -s  Set the serverinfo.xml";
   echo "        -t  Set the CalDAVTester directory";
@@ -61,12 +63,13 @@
   exit 64;
 }
 
-while getopts 'Dhvrozt:s:d:x:' option; do
+while getopts 'Dhvprozt:s:d:x:' option; do
   case "$option" in
     '?') usage; ;;
     'h') usage -; exit 0; ;;
     't') cdt="${OPTARG}"; serverinfo="${OPTARG}/scripts/server/serverinfo.xml"; ;;
     'd') subdir="--subdir=${OPTARG}"; ;;
+    'p') pretests="--pretest CalDAV/pretest.xml"; ;;
     's') serverinfo="${OPTARG}"; ;;
     'r') printres="--always-print-request --always-print-response"; ;;
     'v') verbose="v"; ;;
@@ -139,7 +142,7 @@
 
 echo "Starting CDT run"
 
-cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} ${cdtdebug} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
+cd "${cdt}" && "${python}" testcaldav.py ${random} ${seed} ${ssl} ${cdtdebug} ${pretests} --print-details-onfail ${printres} -s "${serverinfo}" ${subdir} "$@";
 
 # Capture exit status of testcaldav.py to use as this script's exit status.
 

Modified: CalendarServer/trunk/twistedcaldav/stdconfig.py
===================================================================
--- 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)
@@ -580,7 +580,7 @@
         # "VPOLL",
     ],
 
-    "EnableTrashCollection": False,  # Enable Trash Collection
+    "EnableTrashCollection": True,  # Enable Trash Collection
     "ExposeTrashCollection": False,  # Expose Trash Collection as a resource
 
     "ParallelUpgrades": False, # Perform upgrades - currently only the
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150421/cac5a619/attachment.html>


More information about the calendarserver-changes mailing list