[CalendarServer-changes] [13827] CalDAVTester/trunk/scripts

source_changes at macosforge.org source_changes at macosforge.org
Sat Aug 2 12:40:39 PDT 2014


Revision: 13827
          http://trac.calendarserver.org//changeset/13827
Author:   cdaboo at apple.com
Date:     2014-08-02 12:40:39 -0700 (Sat, 02 Aug 2014)
Log Message:
-----------
Fix issues when running tests with longer delays in scheduling queue operations.

Modified Paths:
--------------
    CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
    CalDAVTester/trunk/scripts/server/serverinfo-template.xml
    CalDAVTester/trunk/scripts/server/serverinfo.xml
    CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml

Modified: CalDAVTester/trunk/scripts/server/serverinfo-pod.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-08-02 01:44:11 UTC (rev 13826)
+++ CalDAVTester/trunk/scripts/server/serverinfo-pod.xml	2014-08-02 19:40:39 UTC (rev 13827)
@@ -31,6 +31,7 @@
 
 	<waitcount>120</waitcount>
 	<waitdelay>0.25</waitdelay>
+	<waitsuccess>30</waitsuccess>
 
 	<features>
 		<!--  Generic WebDAV extensions -->

Modified: CalDAVTester/trunk/scripts/server/serverinfo-template.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-08-02 01:44:11 UTC (rev 13826)
+++ CalDAVTester/trunk/scripts/server/serverinfo-template.xml	2014-08-02 19:40:39 UTC (rev 13827)
@@ -26,6 +26,7 @@
 
 	<waitcount>120</waitcount>
 	<waitdelay>0.25</waitdelay>
+	<waitsuccess>30</waitsuccess>
 
 	<features>
 		<!--  Generic WebDAV extensions -->
@@ -110,6 +111,7 @@
 		<feature>carddav</feature> 						<!-- Basic CardDAV feature enabler -->
 		<feature>default-addressbook</feature> 			<!-- Default address book behavior -->
 		<!-- <feature>shared-addressbooks</feature> -->	<!-- Shared address books extension -->
+		<!-- <feature>shared-groups</feature> -->		<!-- Shared groups extension -->
 		<!-- <feature>directory-gateway</feature> -->	<!-- Directory gateway extension -->
 
 	</features>

Modified: CalDAVTester/trunk/scripts/server/serverinfo.xml
===================================================================
--- CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-08-02 01:44:11 UTC (rev 13826)
+++ CalDAVTester/trunk/scripts/server/serverinfo.xml	2014-08-02 19:40:39 UTC (rev 13827)
@@ -26,6 +26,7 @@
 
 	<waitcount>120</waitcount>
 	<waitdelay>0.25</waitdelay>
+	<waitsuccess>30</waitsuccess>
 
 	<features>
 		<!--  Generic WebDAV extensions -->

Modified: CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml
===================================================================
--- CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2014-08-02 01:44:11 UTC (rev 13826)
+++ CalDAVTester/trunk/scripts/tests/CalDAV/implicitauto6.xml	2014-08-02 19:40:39 UTC (rev 13827)
@@ -379,16 +379,12 @@
 					<callback>statusCode</callback>
 				</verify>
 			</request>
-			<request>
-				<method>DELAY</method>
-				<ruri>4</ruri>
-			</request>
 		</test>
 		<test name='2'>
-			<description>No item in user01 Inbox</description>
-			<request>
+			<description>One item in resource01 calendar</description>
+			<request user="$useradmin:" pswd="$pswdadmin:" wait-for-success="yes">
 				<method>PROPFIND</method>
-				<ruri>$inboxpath1:/</ruri>
+				<ruri>$rcalendarpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -401,30 +397,16 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>0</value>
+						<value>1</value>
 					</arg>
 				</verify>
 			</request>
 		</test>
 		<test name='3'>
-			<description>No item in user01 Calendar</description>
+			<description>No item in user01 Inbox</description>
 			<request>
-				<method>GET</method>
-				<ruri>$calendarpath1:/1.ics</ruri>
-				<verify>
-					<callback>statusCode</callback>
-					<arg>
-						<name>status</name>
-						<value>404</value>
-					</arg>
-				</verify>
-			</request>
-		</test>
-		<test name='4'>
-			<description>No items in resource01 Inbox</description>
-			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
-				<ruri>$rinboxpath1:/</ruri>
+				<ruri>$inboxpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -442,11 +424,25 @@
 				</verify>
 			</request>
 		</test>
+		<test name='4'>
+			<description>No item in user01 Calendar</description>
+			<request>
+				<method>GET</method>
+				<ruri>$calendarpath1:/1.ics</ruri>
+				<verify>
+					<callback>statusCode</callback>
+					<arg>
+						<name>status</name>
+						<value>404</value>
+					</arg>
+				</verify>
+			</request>
+		</test>
 		<test name='5'>
-			<description>One item in resource01 calendar</description>
+			<description>No items in resource01 Inbox</description>
 			<request user="$useradmin:" pswd="$pswdadmin:">
 				<method>PROPFIND</method>
-				<ruri>$rcalendarpath1:/</ruri>
+				<ruri>$rinboxpath1:/</ruri>
 				<header>
 					<name>Depth</name>
 					<value>1</value>
@@ -459,7 +455,7 @@
 					<callback>multistatusItems</callback>
 					<arg>
 						<name>count</name>
-						<value>1</value>
+						<value>0</value>
 					</arg>
 				</verify>
 			</request>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140802/44e6f912/attachment.html>


More information about the calendarserver-changes mailing list