[CalendarServer-changes] [13959] CalDAVTester/trunk/src/caldavtest.py

[source_changes at macosforge.org]

Revision: 13959
          http://trac.calendarserver.org//changeset/13959
Author:   cdaboo at apple.com
Date:     2014-09-12 11:54:38 -0700 (Fri, 12 Sep 2014)
Log Message:
-----------
Make sure test fails if any one delete in a DELETEALL fails.

Modified Paths:
--------------
    CalDAVTester/trunk/src/caldavtest.py

Modified: CalDAVTester/trunk/src/caldavtest.py
===================================================================
--- CalDAVTester/trunk/src/caldavtest.py	2014-09-12 17:07:21 UTC (rev 13958)
+++ CalDAVTester/trunk/src/caldavtest.py	2014-09-12 18:54:38 UTC (rev 13959)
@@ -296,9 +296,13 @@
                 req.user = deleter[1]
             if len(deleter[2]):
                 req.pswd = deleter[2]
-            self.dorequest(req, False, False, label=label)
+            _ignore_result, _ignore_resulttxt, response, _ignore_respdata = self.dorequest(req, False, False, label=label)
+            if response.status / 100 != 2:
+                return False
 
+        return True
 
+
     def dofindnew(self, collection, label=""):
         hresult = ""
         possible_matches = set()
@@ -491,7 +495,8 @@
             for ruri in req.ruris:
                 collection = (ruri, req.user, req.pswd)
                 hrefs = self.dofindall(collection, label="%s | %s" % (label, "DELETEALL"))
-                self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL"))
+                if not self.dodeleteall(hrefs, label="%s | %s" % (label, "DELETEALL")):
+                    return False, "DELETEALL failed for: {}".format(ruri), None, None
             return True, "", None, None
 
         # Special for delay
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140912/646ee71e/attachment.html>