[CalendarServer-changes] [8200] CalendarServer/trunk/twistedcaldav/test/util.py

source_changes at macosforge.org source_changes at macosforge.org
Fri Oct 14 15:43:39 PDT 2011


Revision: 8200
          http://trac.macosforge.org/projects/calendarserver/changeset/8200
Author:   sagen at apple.com
Date:     2011-10-14 15:43:39 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
Ignore lack of xattr support in verifyHierarchy

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/test/util.py

Modified: CalendarServer/trunk/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/test/util.py	2011-10-14 22:13:33 UTC (rev 8199)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2011-10-14 22:43:39 UTC (rev 8200)
@@ -273,24 +273,25 @@
                         return False
 
                 if childStructure.has_key("@xattrs"):
-                    xattrs = childStructure["@xattrs"]
-                    for attr, value in xattrs.iteritems():
-                        if isinstance(value, str):
-                            try:
+                    try:
+                        xattrs = childStructure["@xattrs"]
+                        for attr, value in xattrs.iteritems():
+                            if isinstance(value, str):
                                 if xattr.getxattr(childPath, attr) != value:
                                     print "Xattr mismatch:", childPath, attr
                                     print (xattr.getxattr(childPath, attr), " != ", value)
                                     return False
-                            except:
+                            else: # method
+                                if not value(xattr.getxattr(childPath, attr)):
+                                    return False
+
+                        for attr, value in xattr.xattr(childPath).iteritems():
+                            if attr not in xattrs:
                                 return False
-                        else: # method
-                            if not value(xattr.getxattr(childPath, attr)):
-                                return False
+                    except:
+                        # xattr not enabled/supported
+                        pass
 
-                    for attr, value in xattr.xattr(childPath).iteritems():
-                        if attr not in xattrs:
-                            return False
-
             if actual:
                 # There are unexpected children
                 print "Unexpected:", actual, 'in', parent
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111014/4f1fa19d/attachment-0001.html>


More information about the calendarserver-changes mailing list