[CalendarServer-changes] [15269] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 15269
          http://trac.calendarserver.org//changeset/15269
Author:   cdaboo at apple.com
Date:     2015-11-02 11:37:08 -0800 (Mon, 02 Nov 2015)
Log Message:
-----------
Always test new features.

Modified Paths:
--------------
    CalendarServer/trunk/bin/testserver
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/requirements-dev.txt

Modified: CalendarServer/trunk/bin/testserver
===================================================================
--- CalendarServer/trunk/bin/testserver	2015-11-02 19:28:23 UTC (rev 15268)
+++ CalendarServer/trunk/bin/testserver	2015-11-02 19:37:08 UTC (rev 15269)
@@ -118,11 +118,11 @@
 
 # Modify the plist
 
-python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['EnableTrashCollection'] = True; f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; f['ServerRoot'] = u'${sandboxdir_u}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = u'${datadir_u}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'${datadir_u}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'${datadir_u}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'${datadir_u}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
+python -c "import plistlib; f=plistlib.readPlist('${configdir}/caldavd-cdt.plist'); f['HTTPPort'] = 18008; f['BindHTTPPorts'] = [18008]; f['SSLPort'] = 18443; f['BindSSLPorts'] = [18443]; f['Notifications']['Services']['AMP']['Port'] = 62312; f['ServerRoot'] = u'${sandboxdir_u}'; f['ConfigRoot'] = 'Config'; f['RunRoot'] = 'Run'; f['ProxyLoadFromFile'] = u'${datadir_u}/proxies-cdt.xml'; f['ResourceService']['params']['xmlFile'] = u'${datadir_u}/resources-cdt.xml'; f['DirectoryService']['params']['xmlFile'] = u'${datadir_u}/accounts-cdt.xml'; f['AugmentService']['params']['xmlFiles'] = [u'${datadir_u}/augments-cdt.xml']; f['Authentication']['Kerberos']['Enabled'] = False; plistlib.writePlist(f, '${configdir}/caldavd-cdt.plist');"
 
 # Modify serverinfo to update ports
 
-sed "s/8008/18008/g;s/8443/18443/g;s/<\!-- \(<feature>trash-collection<\/feature>\) -->/\1/g" "${serverinfo}" > "${configdir}/serverinfo-cdt.xml"
+sed "s/8008/18008/g;s/8443/18443/g" "${serverinfo}" > "${configdir}/serverinfo-cdt.xml"
 serverinfo="${configdir}/serverinfo-cdt.xml"
 
 # Start the server

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2015-11-02 19:28:23 UTC (rev 15268)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2015-11-02 19:37:08 UTC (rev 15269)
@@ -972,7 +972,7 @@
 
     <!-- Trash -->
     <key>EnableTrashCollection</key>
-    <false/>
+    <true/>
 
   </dict>
 </plist>

Modified: CalendarServer/trunk/requirements-dev.txt
===================================================================
--- CalendarServer/trunk/requirements-dev.txt	2015-11-02 19:28:23 UTC (rev 15268)
+++ CalendarServer/trunk/requirements-dev.txt	2015-11-02 19:37:08 UTC (rev 15269)
@@ -5,4 +5,4 @@
 q
 tl.eggdeps
 --editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVClientLibrary/trunk@14856#egg=CalDAVClientLibrary
---editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15266#egg=CalDAVTester
+--editable svn+http://svn.calendarserver.org/repository/calendarserver/CalDAVTester/trunk@15268#egg=CalDAVTester
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151102/0dedaad2/attachment.html>