[CalendarServer-changes] [5850] CalDAVTester/branches/users/cdaboo/deployment
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 6 20:05:50 PDT 2010
Revision: 5850
http://trac.macosforge.org/projects/calendarserver/changeset/5850
Author: cdaboo at apple.com
Date: 2010-07-06 20:05:49 -0700 (Tue, 06 Jul 2010)
Log Message:
-----------
Tests for pre-conditions with MOVE.
Modified Paths:
--------------
CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml
CalDAVTester/branches/users/cdaboo/deployment/src/caldavtest.py
CalDAVTester/branches/users/cdaboo/deployment/src/request.py
Added Paths:
-----------
CalDAVTester/branches/users/cdaboo/deployment/Resource/copymove/8.xml
Added: CalDAVTester/branches/users/cdaboo/deployment/Resource/copymove/8.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/Resource/copymove/8.xml (rev 0)
+++ CalDAVTester/branches/users/cdaboo/deployment/Resource/copymove/8.xml 2010-07-07 03:05:49 UTC (rev 5850)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getetag/>
+</D:prop>
+</D:propfind>
Modified: CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml 2010-07-07 03:01:11 UTC (rev 5849)
+++ CalDAVTester/branches/users/cdaboo/deployment/scripts/tests/copymove.xml 2010-07-07 03:05:49 UTC (rev 5850)
@@ -363,9 +363,29 @@
</test>
<test name='4'>
<description>MOVE to different calendar, new resource</description>
+ <request print-response='yes'>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>move1.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/copymove/8.xml</filepath>
+ </data>
+ <grabproperty>
+ <property>DAV:getetag</property>
+ <variable>$getetag:</variable>
+ </grabproperty>
+ </request>
<request>
<method>MOVE</method>
<header>
+ <name>If-Match</name>
+ <value>$getetag:</value>
+ </header>
+ <header>
<name>Destination</name>
<value>$host:$pathprefix:/calendar2/move2_1.ics</value>
</header>
@@ -381,9 +401,29 @@
</test>
<test name='5'>
<description>MOVE to different calendar, existing resource with overwrite</description>
+ <request print-response='yes'>
+ <method>PROPFIND</method>
+ <header>
+ <name>Depth</name>
+ <value>0</value>
+ </header>
+ <ruri>3.ics</ruri>
+ <data>
+ <content-type>text/calendar; charset=utf-8</content-type>
+ <filepath>Resource/copymove/8.xml</filepath>
+ </data>
+ <grabproperty>
+ <property>DAV:getetag</property>
+ <variable>$getetag:</variable>
+ </grabproperty>
+ </request>
<request>
<method>MOVE</method>
<header>
+ <name>If-Match</name>
+ <value>$getetag:</value>
+ </header>
+ <header>
<name>Destination</name>
<value>$host:$pathprefix:/calendar2/3.ics</value>
</header>
Modified: CalDAVTester/branches/users/cdaboo/deployment/src/caldavtest.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/src/caldavtest.py 2010-07-07 03:01:11 UTC (rev 5849)
+++ CalDAVTester/branches/users/cdaboo/deployment/src/caldavtest.py 2010-07-07 03:05:49 UTC (rev 5850)
@@ -38,6 +38,7 @@
import src.xmlDefs
import time
import xattr
+from xml.dom.expatbuilder import TEXT_NODE
import xml.dom.minidom
STATUSTXT_WIDTH = 60
@@ -561,7 +562,7 @@
# Copy sub-element data as text into one long string and strip leading/trailing space
value = ""
for p in child._get_childNodes():
- temp = p.toprettyxml("", "")
+ temp = p.data if p.nodeType == TEXT_NODE else p.toprettyxml("", "")
temp = temp.strip()
value += temp
else:
Modified: CalDAVTester/branches/users/cdaboo/deployment/src/request.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/deployment/src/request.py 2010-07-07 03:01:11 UTC (rev 5849)
+++ CalDAVTester/branches/users/cdaboo/deployment/src/request.py 2010-07-07 03:05:49 UTC (rev 5850)
@@ -163,6 +163,8 @@
def getHeaders( self, si ):
hdrs = self.headers
+ for key, value in hdrs.items():
+ hdrs[key] = si.extrasubs(value)
# Content type
if self.data != None:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100706/45166860/attachment.html>
More information about the calendarserver-changes
mailing list