[CalendarServer-changes] [4045] CalendarServer/branches/exarkun/update-twisted-3816-2
source_changes at macosforge.org
source_changes at macosforge.org
Mon Apr 20 12:50:09 PDT 2009
Revision: 4045
http://trac.macosforge.org/projects/calendarserver/changeset/4045
Author: exarkun at twistedmatrix.com
Date: 2009-04-20 12:50:09 -0700 (Mon, 20 Apr 2009)
Log Message:
-----------
Change the whitespace in the documents the tests expect; the implementation is serializing these results with slightly less whitespace now
Modified Paths:
--------------
CalendarServer/branches/exarkun/update-twisted-3816-2/twistedcaldav/test/test_upgrade.py
Removed Paths:
-------------
CalendarServer/branches/exarkun/update-twisted-3816-2/lib-patches/Twisted/twisted.runner.procmon.patch
Deleted: CalendarServer/branches/exarkun/update-twisted-3816-2/lib-patches/Twisted/twisted.runner.procmon.patch
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816-2/lib-patches/Twisted/twisted.runner.procmon.patch 2009-04-20 19:49:38 UTC (rev 4044)
+++ CalendarServer/branches/exarkun/update-twisted-3816-2/lib-patches/Twisted/twisted.runner.procmon.patch 2009-04-20 19:50:09 UTC (rev 4045)
@@ -1,39 +0,0 @@
-Index: twisted/runner/procmon.py
-===================================================================
---- twisted/runner/procmon.py (revision 19773)
-+++ twisted/runner/procmon.py (working copy)
-@@ -59,6 +59,9 @@
-
- disconnecting = 0
-
-+ def loseConnection(self):
-+ pass
-+
- transport = DummyTransport()
-
- class LineLogger(basic.LineReceiver):
-@@ -130,10 +133,10 @@
- self.consistency = reactor.callLater(self.consistencyDelay,
- self._checkConsistency)
-
-- def addProcess(self, name, args, uid=None, gid=None):
-+ def addProcess(self, name, args, uid=None, gid=None, env={}):
- if self.processes.has_key(name):
- raise KeyError("remove %s first" % name)
-- self.processes[name] = args, uid, gid
-+ self.processes[name] = args, uid, gid, env
- if self.active:
- self.startProcess(name)
-
-@@ -175,9 +178,9 @@
- p = self.protocols[name] = LoggingProtocol()
- p.service = self
- p.name = name
-- args, uid, gid = self.processes[name]
-+ args, uid, gid, env = self.processes[name]
- self.timeStarted[name] = time.time()
-- reactor.spawnProcess(p, args[0], args, uid=uid, gid=gid)
-+ reactor.spawnProcess(p, args[0], args, uid=uid, gid=gid, env=env)
-
- def _forceStopProcess(self, proc):
- try:
Modified: CalendarServer/branches/exarkun/update-twisted-3816-2/twistedcaldav/test/test_upgrade.py
===================================================================
--- CalendarServer/branches/exarkun/update-twisted-3816-2/twistedcaldav/test/test_upgrade.py 2009-04-20 19:49:38 UTC (rev 4044)
+++ CalendarServer/branches/exarkun/update-twisted-3816-2/twistedcaldav/test/test_upgrade.py 2009-04-20 19:50:09 UTC (rev 4045)
@@ -231,7 +231,7 @@
# Verify these values do require updating:
#
- expected = "<?xml version='1.0' encoding='UTF-8'?>\r\n<calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>\r\n"
+ expected = "<?xml version='1.0' encoding='UTF-8'?><calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>"
# Uncompressed XML
value = "<?xml version='1.0' encoding='UTF-8'?>\r\n<calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/users/wsanchez/calendar</href>\r\n</calendar-free-busy-set>\r\n"
@@ -357,7 +357,7 @@
{
"@xattrs" :
{
- freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>\r\n"),
+ freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?><calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>"),
},
},
},
@@ -469,7 +469,7 @@
{
"@xattrs" :
{
- freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>\r\n"),
+ freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?><calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>"),
},
},
},
@@ -585,7 +585,7 @@
{
"@xattrs" :
{
- freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?>\r\n<calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>\r\n"),
+ freeBusyAttr : zlib.compress("<?xml version='1.0' encoding='UTF-8'?><calendar-free-busy-set xmlns='urn:ietf:params:xml:ns:caldav'>\r\n <href xmlns='DAV:'>/calendars/__uids__/6423F94A-6B76-4A3A-815B-D52CFD77935D/calendar/</href>\r\n</calendar-free-busy-set>"),
},
},
},
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090420/7a989ff2/attachment-0001.html>
More information about the calendarserver-changes
mailing list