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

[source_changes at macosforge.org]

Revision: 8201
          http://trac.macosforge.org/projects/calendarserver/changeset/8201
Author:   sagen at apple.com
Date:     2011-10-14 15:53:16 -0700 (Fri, 14 Oct 2011)
Log Message:
-----------
Be more specific in xattr exception, and also ignore lack of xattrs in creation of test hierarchy.

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:43:39 UTC (rev 8200)
+++ CalendarServer/trunk/twistedcaldav/test/util.py	2011-10-14 22:53:16 UTC (rev 8201)
@@ -189,7 +189,10 @@
                 if childStructure.has_key("@xattrs"):
                     xattrs = childStructure["@xattrs"]
                     for attr, value in xattrs.iteritems():
-                        xattr.setxattr(childPath, attr, value)
+                        try:
+                            xattr.setxattr(childPath, attr, value)
+                        except IOError:
+                            pass
 
         createChildren(root, structure)
         return root
@@ -288,7 +291,7 @@
                         for attr, value in xattr.xattr(childPath).iteritems():
                             if attr not in xattrs:
                                 return False
-                    except:
+                    except IOError:
                         # xattr not enabled/supported
                         pass
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20111014/4e04427c/attachment.html>