[CalendarServer-changes] [8356] CalDAVTester/trunk/verifiers/dataString.py

[source_changes at macosforge.org]

Revision: 8356
          http://trac.macosforge.org/projects/calendarserver/changeset/8356
Author:   cdaboo at apple.com
Date:     2011-11-30 09:15:45 -0800 (Wed, 30 Nov 2011)
Log Message:
-----------
More lenient line-end matching.

Modified Paths:
--------------
    CalDAVTester/trunk/verifiers/dataString.py

Modified: CalDAVTester/trunk/verifiers/dataString.py
===================================================================
--- CalDAVTester/trunk/verifiers/dataString.py	2011-11-30 15:58:18 UTC (rev 8355)
+++ CalDAVTester/trunk/verifiers/dataString.py	2011-11-30 17:15:45 UTC (rev 8356)
@@ -38,11 +38,11 @@
         # Check each contains and not-contains (AND operation)
         for item in contains:
             item = manager.server_info.subs(item)
-            if newrespdata.find(item.replace("\n", "\r\n")) == -1:
+            if newrespdata.find(item.replace("\n", "\r\n")) == -1 and newrespdata.find(item) == -1:
                 return False, "        Response data does not contain \"%s\"" % (item,)
         for item in notcontains:
             item = manager.server_info.subs(item)
-            if newrespdata.find(item.replace("\n", "\r\n")) != -1:
+            if newrespdata.find(item.replace("\n", "\r\n")) != -1 or newrespdata.find(item) == -1:
                 return False, "        Response data incorrectly contains \"%s\"" % (item,)
 
         return True, ""
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111130/9713d492/attachment.html>