From 32eabc43501d0558fffb2d8e9b53e61bff0f9bd0 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 2 Feb 2010 21:35:12 +0000
Subject: [PATCH] Monotone-Parent: 8b8ee97bac3348f28840940fdf58d205587d035f
 Monotone-Revision: 56021366a01dca213c584b0652d1fb04b91c7f22

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-02T21:35:12
Monotone-Branch: ca.inverse.sogo
---
 Tests/Integration/test-davacl.py | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/Tests/Integration/test-davacl.py b/Tests/Integration/test-davacl.py
index 450da33d9..35e474f9e 100755
--- a/Tests/Integration/test-davacl.py
+++ b/Tests/Integration/test-davacl.py
@@ -267,32 +267,32 @@ class DAVCalendarAclTest(DAVAclTest):
 
     def _testEventDAVAcl(self, event_class, right):
         icsClass = self.classToICSClass[event_class].lower()
-        filename = "%s-event.ics" % icsClass
-        url = "%s%s" % (self.resource, filename)
+        for suffix in [ "event", "task" ]:
+            url = "%s%s-%s.ics" % (self.resource, icsClass, suffix)
 
-        if right is None:
-            expectFailure = True
-            expectedPrivileges = None
-        else:
-            expectFailure = False
-            expectedPrivileges = ['{DAV:}read-current-user-privilege-set',
-                                  '{urn:inverse:params:xml:ns:inverse-dav}view-date-and-time',
-                                  '{DAV:}read']
-            if right != "d":
-                extraPrivilege = '{urn:inverse:params:xml:ns:inverse-dav}view-whole-component'
-                expectedPrivileges.append(extraPrivilege)
-                if right != "v":
-                    extraPrivileges = ['{urn:inverse:params:xml:ns:inverse-dav}respond-to-component',
-                                       '{DAV:}write-content']
-                    expectedPrivileges.extend(extraPrivileges)
-                    if right != "r":
-                        extraPrivileges = ['{DAV:}write-properties',
-                                           '{DAV:}write']
+            if right is None:
+                expectFailure = True
+                expectedPrivileges = None
+            else:
+                expectFailure = False
+                expectedPrivileges = ['{DAV:}read-current-user-privilege-set',
+                                      '{urn:inverse:params:xml:ns:inverse-dav}view-date-and-time',
+                                      '{DAV:}read']
+                if right != "d":
+                    extraPrivilege = '{urn:inverse:params:xml:ns:inverse-dav}view-whole-component'
+                    expectedPrivileges.append(extraPrivilege)
+                    if right != "v":
+                        extraPrivileges = ['{urn:inverse:params:xml:ns:inverse-dav}respond-to-component',
+                                           '{DAV:}write-content']
                         expectedPrivileges.extend(extraPrivileges)
+                        if right != "r":
+                            extraPrivileges = ['{DAV:}write-properties',
+                                               '{DAV:}write']
+                            expectedPrivileges.extend(extraPrivileges)
 
-        privileges = self._currentUserPrivilegeSet(url, expectFailure)
-        if not expectFailure:
-            self._comparePrivilegeSets(expectedPrivileges, privileges)
+            privileges = self._currentUserPrivilegeSet(url, expectFailure)
+            if not expectFailure:
+                self._comparePrivilegeSets(expectedPrivileges, privileges)
 
     def _testRights(self, rights):
         self.acl_utility.setupRights(subscriber_username, rights)