[CalendarServer-changes] [2982] CalDAVTester/branches/users/cdaboo/implicitauto-2948/verifiers/ calendarDataMatch.py

[source_changes at macosforge.org]

Revision: 2982
          http://trac.macosforge.org/projects/calendarserver/changeset/2982
Author:   cdaboo at apple.com
Date:     2008-09-11 11:53:30 -0700 (Thu, 11 Sep 2008)
Log Message:
-----------
Don't all invalid calendar data exception to propagate.

Modified Paths:
--------------
    CalDAVTester/branches/users/cdaboo/implicitauto-2948/verifiers/calendarDataMatch.py

Modified: CalDAVTester/branches/users/cdaboo/implicitauto-2948/verifiers/calendarDataMatch.py
===================================================================
--- CalDAVTester/branches/users/cdaboo/implicitauto-2948/verifiers/calendarDataMatch.py	2008-09-11 18:52:46 UTC (rev 2981)
+++ CalDAVTester/branches/users/cdaboo/implicitauto-2948/verifiers/calendarDataMatch.py	2008-09-11 18:53:30 UTC (rev 2982)
@@ -73,19 +73,23 @@
                             item.params["X-CALENDARSERVER-DTSTAMP"] = ["20080101T000000Z"]
 
         s = StringIO.StringIO(respdata)
-        resp_calendar = readOne(s)
-        removePropertiesParameters(resp_calendar)
-        respdata = resp_calendar.serialize()
-        
-        s = StringIO.StringIO(data)
-        data_calendar = readOne(s)
-        removePropertiesParameters(data_calendar)
-        data = data_calendar.serialize()
-        
-        result = respdata == data
-                
-        if result:
-            return True, ""
-        else:
-            error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
-            return False, "        Response data does not exactly match file data%s" % (error_diff,)
+        try:
+            resp_calendar = readOne(s)
+            removePropertiesParameters(resp_calendar)
+            respdata = resp_calendar.serialize()
+            
+            s = StringIO.StringIO(data)
+            data_calendar = readOne(s)
+            removePropertiesParameters(data_calendar)
+            data = data_calendar.serialize()
+            
+            result = respdata == data
+                    
+            if result:
+                return True, ""
+            else:
+                error_diff = "\n".join([line for line in unified_diff(data.split("\n"), respdata.split("\n"))])
+                return False, "        Response data does not exactly match file data%s" % (error_diff,)
+        except:
+                return False, "        Response data is not calendar data data"
+            
\ No newline at end of file
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080911/d13ec7a5/attachment.html