Monotone-Parent: a17c467b0c0d4f1aa961b8c26c0c1bc8b4eaea0a

Monotone-Revision: e317d6ac631448579d7b2eab17ddc3b866550a63

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-18T11:33:53
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-01-18 11:33:53 +00:00
parent ef3cb1dae0
commit 2a9bd7b645
2 changed files with 19 additions and 19 deletions

View File

@@ -62,18 +62,6 @@ class DAVAclTest(unittest.TestCase):
return versitStruct
# Calendar:
# rights:
# v: view all
# d: view date and time
# m: modify
# r: respond
# short rights notation: { "c": create,
# "d": delete,
# "pu": public,
# "pr": private,
# "co": confidential }
event_template = """BEGIN:VCALENDAR
VERSION:2.0
PRODID:-//Inverse//Event Generator//EN
@@ -103,7 +91,7 @@ class DAVCalendarAclTest(DAVAclTest):
def setUp(self):
DAVAclTest.setUp(self)
self.user_email = self.acl_utility.fetchUserInfo(username)[0]
self.user_email = self.acl_utility.fetchUserInfo(username)[1]
self.classToICSClass = { "pu": "PUBLIC",
"pr": "PRIVATE",
"co": "CONFIDENTIAL" }
@@ -406,12 +394,6 @@ class DAVCalendarAclTest(DAVAclTest):
"'respond to' event does not match:\nreceived:\n"
"/%s/\nexpected:\n/%s/" % (event, exp_event))
# Addressbook:
# short rights notation: { "c": create,
# "d": delete,
# "e": edit,
# "v": view }
class DAVAddressBookAclTest(DAVAclTest):
resource = '/SOGo/dav/%s/Contacts/test-dav-acl/' % username
cards = { "new.vcf": """BEGIN:VCARD

View File

@@ -49,6 +49,18 @@ class TestACLUtility(TestUtility):
"rights modification: failure to set '%s' (status: %d)"
% (rights_str, post.response["status"]))
# Calendar:
# rights:
# v: view all
# d: view date and time
# m: modify
# r: respond
# short rights notation: { "c": create,
# "d": delete,
# "pu": public,
# "pr": private,
# "co": confidential }
class TestCalendarACLUtility(TestACLUtility):
def rightsToSOGoRights(self, rights):
sogoRights = []
@@ -72,6 +84,12 @@ class TestCalendarACLUtility(TestACLUtility):
return sogoRights
# Addressbook:
# short rights notation: { "c": create,
# "d": delete,
# "e": edit,
# "v": view }
class TestAddressBookACLUtility(TestACLUtility):
def rightsToSOGoRights(self, rights):
sogoRightsTable = { "c": "ObjectCreator",