[CalendarServer-changes] [13759] CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jul 15 17:13:57 PDT 2014
Revision: 13759
http://trac.calendarserver.org//changeset/13759
Author: gaya at apple.com
Date: 2014-07-15 17:13:57 -0700 (Tue, 15 Jul 2014)
Log Message:
-----------
use human-readable uids
Modified Paths:
--------------
CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py
Added Paths:
-----------
CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml
Removed Paths:
-------------
CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml
Copied: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml (from rev 13757, CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml)
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml (rev 0)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAccounts.xml 2014-07-16 00:13:57 UTC (rev 13759)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+Copyright (c) 2006-2014 Apple Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+ -->
+
+<!DOCTYPE accounts SYSTEM "accounts.dtd">
+
+<directory realm="Test Realm">
+ <record type="user">
+ <short-name>user01</short-name>
+ <uid>user01</uid>
+ <guid>10000000-0000-0000-0000-000000000001</guid>
+ <password>user01</password>
+ <full-name>User 01</full-name>
+ <email>user01 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user02</short-name>
+ <uid>user02</uid>
+ <guid>10000000-0000-0000-0000-000000000002</guid>
+ <password>user02</password>
+ <full-name>User 02</full-name>
+ <email>user02 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user03</short-name>
+ <uid>user03</uid>
+ <guid>10000000-0000-0000-0000-000000000003</guid>
+ <password>user03</password>
+ <full-name>User 03</full-name>
+ <email>user03 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user04</short-name>
+ <uid>user04</uid>
+ <guid>10000000-0000-0000-0000-000000000004</guid>
+ <password>user04</password>
+ <full-name>User 04</full-name>
+ <email>user04 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user05</short-name>
+ <uid>user05</uid>
+ <guid>10000000-0000-0000-0000-000000000005</guid>
+ <password>user05</password>
+ <full-name>User 05</full-name>
+ <email>user05 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user06</short-name>
+ <uid>user06</uid>
+ <guid>10000000-0000-0000-0000-000000000006</guid>
+ <password>user06</password>
+ <full-name>User 06</full-name>
+ <email>user06 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user07</short-name>
+ <uid>user07</uid>
+ <guid>10000000-0000-0000-0000-000000000007</guid>
+ <password>user07</password>
+ <full-name>User 07</full-name>
+ <email>user07 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user08</short-name>
+ <uid>user08</uid>
+ <guid>10000000-0000-0000-0000-000000000008</guid>
+ <password>user08</password>
+ <full-name>User 08</full-name>
+ <email>user08 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user09</short-name>
+ <uid>user09</uid>
+ <guid>10000000-0000-0000-0000-000000000009</guid>
+ <password>user09</password>
+ <full-name>User 09</full-name>
+ <email>user09 at example.com</email>
+ </record>
+ <record type="user">
+ <short-name>user10</short-name>
+ <uid>user10</uid>
+ <guid>10000000-0000-0000-0000-000000000010</guid>
+ <password>user10</password>
+ <full-name>User 10</full-name>
+ <email>user10 at example.com</email>
+ </record>
+ <record type="group">
+ <short-name>group01</short-name>
+ <uid>group01</uid>
+ <guid>20000000-0000-0000-0000-000000000001</guid>
+ <full-name>Group 01</full-name>
+ <email>group01 at example.com</email>
+ <member-uid>user01</member-uid>
+ </record>
+ <record type="group">
+ <short-name>group02</short-name>
+ <uid>group02</uid>
+ <guid>20000000-0000-0000-0000-000000000002</guid>
+ <full-name>Group 02</full-name>
+ <email>group02 at example.com</email>
+ <member-uid>user06</member-uid>
+ <member-uid>user07</member-uid>
+ <member-uid>user08</member-uid>
+ </record>
+ <record type="group">
+ <short-name>group03</short-name>
+ <uid>group03</uid>
+ <guid>20000000-0000-0000-0000-000000000003</guid>
+ <full-name>Group 03</full-name>
+ <email>group03 at example.com</email>
+ <member-uid>user07</member-uid>
+ <member-uid>user08</member-uid>
+ <member-uid>user09</member-uid>
+ </record>
+ <record type="group">
+ <short-name>group04</short-name>
+ <uid>group04</uid>
+ <guid>20000000-0000-0000-0000-000000000004</guid>
+ <full-name>Group 04</full-name>
+ <member-uid>group02</member-uid>
+ <member-uid>group03</member-uid>
+ <member-uid>user10</member-uid>
+ </record>
+</directory>
Deleted: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml 2014-07-16 00:07:13 UTC (rev 13758)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/accounts/groupAttendeeAccounts.xml 2014-07-16 00:13:57 UTC (rev 13759)
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-Copyright (c) 2006-2014 Apple Inc. All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
- -->
-
-<!DOCTYPE accounts SYSTEM "accounts.dtd">
-
-<directory realm="Test Realm">
- <record type="user">
- <short-name>user01</short-name>
- <uid>10000000-0000-0000-0000-000000000001</uid>
- <guid>10000000-0000-0000-0000-000000000001</guid>
- <password>user01</password>
- <full-name>User 01</full-name>
- <email>user01 at example.com</email>
- </record>
- <record type="user">
- <short-name>user02</short-name>
- <uid>10000000-0000-0000-0000-000000000002</uid>
- <guid>10000000-0000-0000-0000-000000000002</guid>
- <password>user02</password>
- <full-name>User 02</full-name>
- <email>user02 at example.com</email>
- </record>
- <record type="user">
- <short-name>user03</short-name>
- <uid>10000000-0000-0000-0000-000000000003</uid>
- <guid>10000000-0000-0000-0000-000000000003</guid>
- <password>user03</password>
- <full-name>User 03</full-name>
- <email>user03 at example.com</email>
- </record>
- <record type="user">
- <short-name>user04</short-name>
- <uid>10000000-0000-0000-0000-000000000004</uid>
- <guid>10000000-0000-0000-0000-000000000004</guid>
- <password>user04</password>
- <full-name>User 04</full-name>
- <email>user04 at example.com</email>
- </record>
- <record type="user">
- <short-name>user05</short-name>
- <uid>10000000-0000-0000-0000-000000000005</uid>
- <guid>10000000-0000-0000-0000-000000000005</guid>
- <password>user05</password>
- <full-name>User 05</full-name>
- <email>user05 at example.com</email>
- </record>
- <record type="user">
- <short-name>user06</short-name>
- <uid>10000000-0000-0000-0000-000000000006</uid>
- <guid>10000000-0000-0000-0000-000000000006</guid>
- <password>user06</password>
- <full-name>User 06</full-name>
- <email>user06 at example.com</email>
- </record>
- <record type="user">
- <short-name>user07</short-name>
- <uid>10000000-0000-0000-0000-000000000007</uid>
- <guid>10000000-0000-0000-0000-000000000007</guid>
- <password>user07</password>
- <full-name>User 07</full-name>
- <email>user07 at example.com</email>
- </record>
- <record type="user">
- <short-name>user08</short-name>
- <uid>10000000-0000-0000-0000-000000000008</uid>
- <guid>10000000-0000-0000-0000-000000000008</guid>
- <password>user08</password>
- <full-name>User 08</full-name>
- <email>user08 at example.com</email>
- </record>
- <record type="user">
- <short-name>user09</short-name>
- <uid>10000000-0000-0000-0000-000000000009</uid>
- <guid>10000000-0000-0000-0000-000000000009</guid>
- <password>user09</password>
- <full-name>User 09</full-name>
- <email>user09 at example.com</email>
- </record>
- <record type="user">
- <short-name>user10</short-name>
- <uid>10000000-0000-0000-0000-000000000010</uid>
- <guid>10000000-0000-0000-0000-000000000010</guid>
- <password>user10</password>
- <full-name>User 10</full-name>
- <email>user10 at example.com</email>
- </record>
- <record type="group">
- <short-name>group01</short-name>
- <uid>20000000-0000-0000-0000-000000000001</uid>
- <guid>20000000-0000-0000-0000-000000000001</guid>
- <full-name>Group 01</full-name>
- <email>group01 at example.com</email>
- <member-uid>10000000-0000-0000-0000-000000000001</member-uid>
- </record>
- <record type="group">
- <short-name>group02</short-name>
- <uid>20000000-0000-0000-0000-000000000002</uid>
- <guid>20000000-0000-0000-0000-000000000002</guid>
- <full-name>Group 02</full-name>
- <email>group02 at example.com</email>
- <member-uid>10000000-0000-0000-0000-000000000006</member-uid>
- <member-uid>10000000-0000-0000-0000-000000000007</member-uid>
- <member-uid>10000000-0000-0000-0000-000000000008</member-uid>
- </record>
- <record type="group">
- <short-name>group03</short-name>
- <uid>20000000-0000-0000-0000-000000000003</uid>
- <guid>20000000-0000-0000-0000-000000000003</guid>
- <full-name>Group 03</full-name>
- <email>group03 at example.com</email>
- <member-uid>10000000-0000-0000-0000-000000000007</member-uid>
- <member-uid>10000000-0000-0000-0000-000000000008</member-uid>
- <member-uid>10000000-0000-0000-0000-000000000009</member-uid>
- </record>
- <record type="group">
- <short-name>group04</short-name>
- <uid>20000000-0000-0000-0000-000000000004</uid>
- <guid>20000000-0000-0000-0000-000000000004</guid>
- <full-name>Group 04</full-name>
- <member-uid>20000000-0000-0000-0000-000000000002</member-uid>
- <member-uid>20000000-0000-0000-0000-000000000003</member-uid>
- <member-uid>10000000-0000-0000-0000-000000000010</member-uid>
- </record>
-</directory>
Modified: CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py
===================================================================
--- CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py 2014-07-16 00:07:13 UTC (rev 13758)
+++ CalendarServer/branches/users/gaya/groupsharee2/txdav/who/test/test_group_attendees.py 2014-07-16 00:13:57 UTC (rev 13759)
@@ -47,8 +47,7 @@
os.path.join(os.path.dirname(__file__), "accounts")
)
yield self.buildStoreAndDirectory(
- accounts=accountsFilePath.child("groupAttendeeAccounts.xml"),
- resources=accountsFilePath.child("resources.xml"),
+ accounts=accountsFilePath.child("groupAccounts.xml"),
)
yield self.populate()
@@ -67,13 +66,13 @@
yield populateCalendarsFrom(self.requirements, self.storeUnderTest())
requirements = {
- "10000000-0000-0000-0000-000000000001" : None,
- "10000000-0000-0000-0000-000000000002" : None,
- "10000000-0000-0000-0000-000000000006" : None,
- "10000000-0000-0000-0000-000000000007" : None,
- "10000000-0000-0000-0000-000000000008" : None,
- "10000000-0000-0000-0000-000000000009" : None,
- "10000000-0000-0000-0000-000000000010" : None,
+ "user01" : None,
+ "user02" : None,
+ "user06" : None,
+ "user07" : None,
+ "user08" : None,
+ "user09" : None,
+ "user10" : None,
}
@@ -112,7 +111,7 @@
"""
Test that group attendee is expanded on PUT
"""
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -139,31 +138,31 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
"""
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 0)
+ yield self._verifyObjectResourceCount("user06", 0)
+ yield self._verifyObjectResourceCount("user07", 0)
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
@inlineCallbacks
@@ -171,7 +170,7 @@
"""
Test unknown group with CUTYPE=X-SERVER-GROUP handled
"""
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -198,10 +197,10 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
ATTENDEE;CUTYPE=X-SERVER-GROUP;RSVP=TRUE;SCHEDULE-STATUS=3.7:urn:uuid:FFFFFFFF-EEEE-DDDD-CCCC-BBBBBBBBBBBB
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
@@ -211,7 +210,7 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
@@ -221,7 +220,7 @@
"""
Test that primary attendee also in group remains primary
"""
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -249,11 +248,11 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
@@ -262,7 +261,7 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
@@ -272,13 +271,13 @@
"""
Test that nested groups are expanded expanded on PUT
"""
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000010", 0)
+ yield self._verifyObjectResourceCount("user06", 0)
+ yield self._verifyObjectResourceCount("user07", 0)
+ yield self._verifyObjectResourceCount("user08", 0)
+ yield self._verifyObjectResourceCount("user09", 0)
+ yield self._verifyObjectResourceCount("user10", 0)
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -293,7 +292,7 @@
UID:event1 at ninevah.local
ORGANIZER:MAILTO:user01 at example.com
ATTENDEE:mailto:user01 at example.com
-ATTENDEE:urn:x-uid:20000000-0000-0000-0000-000000000004
+ATTENDEE:urn:x-uid:group04
END:VEVENT
END:VCALENDAR"""
@@ -305,15 +304,15 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 04;CUTYPE=X-SERVER-GROUP;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000004
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
-ATTENDEE;CN=User 10;EMAIL=user10 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000004";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000010
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 04;CUTYPE=X-SERVER-GROUP;RSVP=TRUE:urn:x-uid:group04
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group04";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group04";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group04";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group04";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
+ATTENDEE;CN=User 10;EMAIL=user10 at example.com;MEMBER="urn:x-uid:group04";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user10
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
@@ -323,15 +322,15 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000010", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
+ yield self._verifyObjectResourceCount("user08", 1)
+ yield self._verifyObjectResourceCount("user09", 1)
+ yield self._verifyObjectResourceCount("user10", 1)
@inlineCallbacks
@@ -339,12 +338,12 @@
"""
Test that expanded users in two primary groups have groups in MEMBERS param
"""
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 0)
+ yield self._verifyObjectResourceCount("user06", 0)
+ yield self._verifyObjectResourceCount("user07", 0)
+ yield self._verifyObjectResourceCount("user08", 0)
+ yield self._verifyObjectResourceCount("user09", 0)
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -373,16 +372,16 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:group03
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR"""
@@ -391,14 +390,14 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
+ yield self._verifyObjectResourceCount("user08", 1)
+ yield self._verifyObjectResourceCount("user09", 1)
@inlineCallbacks
@@ -432,10 +431,10 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
@@ -449,11 +448,11 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -468,10 +467,10 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SEQUENCE:2
SUMMARY:event 1
END:VEVENT
@@ -490,50 +489,50 @@
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 0)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
self.assertEqual(len(wps), 0)
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 0)
+ yield self._verifyObjectResourceCount("user01", 0)
yield self.commit()
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 1)
- self.assertEqual(list(groupsToRefresh)[0], "20000000-0000-0000-0000-000000000001")
+ self.assertEqual(list(groupsToRefresh)[0], "group01")
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 1)
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_3))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 1)
+ yield self._verifyObjectResourceCount("user01", 1)
yield self.commit()
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 1)
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_4))
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
cobjs = yield cal.objectResources()
self.assertEqual(len(cobjs), 1)
comp = yield cobjs[0].componentForUser()
@@ -571,10 +570,10 @@
UID:event{0}@ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}
SUMMARY:event {0}
END:VEVENT
END:VCALENDAR
@@ -588,11 +587,11 @@
UID:event{0}@ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}
SEQUENCE:1
SUMMARY:event {0}
END:VEVENT
@@ -607,10 +606,10 @@
UID:event{0}@ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 0{0};EMAIL=user0{0}@example.com;RSVP=TRUE:urn:x-uid:user0{0}
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:10000000-0000-0000-0000-00000000000{0}
+ORGANIZER;CN=User 0{0};EMAIL=user0{0}@example.com:urn:x-uid:user0{0}
SEQUENCE:2
SUMMARY:event {0}
END:VEVENT
@@ -629,55 +628,55 @@
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 0)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
self.assertEqual(len(wps), 0)
userRange = range(6, 10) # have to be 1 diget and homes in requirements
for i in userRange:
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-00000000000{0}".format(i))
+ calendar = yield self.calendarUnderTest(name="calendar", home="user0{0}".format(i))
vcalendar = Component.fromString(data_put_1.format(i))
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-00000000000{0}".format(i))
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2.format(i)))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 0)
+ yield self._verifyObjectResourceCount("user01", 0)
yield self.commit()
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 1)
- self.assertEqual(list(groupsToRefresh)[0], "20000000-0000-0000-0000-000000000001")
+ self.assertEqual(list(groupsToRefresh)[0], "group01")
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), len(userRange))
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
for i in userRange:
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-00000000000{0}".format(i))
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_3.format(i)))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", len(userRange))
+ yield self._verifyObjectResourceCount("user01", len(userRange))
yield self.commit()
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), len(userRange))
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
for i in userRange:
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-00000000000{0}".format(i))
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user0{0}".format(i))
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_4.format(i)))
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
cobjs = yield cal.objectResources()
self.assertEqual(len(cobjs), len(userRange))
for cobj in cobjs:
@@ -716,18 +715,18 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
"""
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
@@ -735,13 +734,13 @@
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 0)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
if len(wps): # This is needed because the test currently fails and does actually create job items we have to wait for
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
self.assertEqual(len(wps), 0)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
@@ -794,11 +793,11 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SUMMARY:event 1
END:VEVENT
END:VCALENDAR
@@ -812,10 +811,10 @@
UID:event1 at ninevah.local
DTSTART:20140101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -830,24 +829,24 @@
unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 1)
- self.assertEqual(list(groupsToRefresh)[0], "20000000-0000-0000-0000-000000000001")
+ self.assertEqual(list(groupsToRefresh)[0], "group01")
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 0)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 1)
+ yield self._verifyObjectResourceCount("user01", 1)
vcalendar = Component.fromString(data_put_2)
yield cobj.setComponent(vcalendar)
@@ -855,11 +854,11 @@
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
self.assertEqual(len(wps), 0)
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
@@ -870,7 +869,7 @@
(
groupID, _ignore_name, _ignore_membershipHash, _ignore_modDate,
_ignore_extant
- ) = yield self.transactionUnderTest().groupByUID("20000000-0000-0000-0000-000000000001")
+ ) = yield self.transactionUnderTest().groupByUID("group01")
ga = schema.GROUP_ATTENDEE
yield Insert({
ga.RESOURCE_ID: cobj._resourceID,
@@ -878,17 +877,17 @@
ga.MEMBERSHIP_HASH: (-1),
}
).on(self.transactionUnderTest())
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
self.assertEqual(len(wps), 1)
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))
'''
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
cobjs = yield cal.objectResources()
for cobj in cobjs:
print("comp = %s" % ((yield cobj.componentForUser())))
@@ -954,11 +953,11 @@
UID:event1 at ninevah.local
DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
RRULE:FREQ=DAILY;UNTIL=20240101T100000
SUMMARY:event 1
END:VEVENT
@@ -973,10 +972,10 @@
UID:event1 at ninevah.local
DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
RRULE:FREQ=DAILY;UNTIL=20140101T100000
SEQUENCE:1
SUMMARY:event 1
@@ -992,24 +991,24 @@
unpatchedExpandedMembers = CalendarDirectoryRecordMixin.expandedMembers
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 1)
- self.assertEqual(list(groupsToRefresh)[0], "20000000-0000-0000-0000-000000000001")
+ self.assertEqual(list(groupsToRefresh)[0], "group01")
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 0)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 1)
+ yield self._verifyObjectResourceCount("user01", 1)
vcalendar = Component.fromString(data_put_2)
yield cobj.setComponent(vcalendar)
@@ -1017,11 +1016,11 @@
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
if len(wps): # This is needed because the test currently fails and does actually create job items we have to wait for
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
@@ -1033,7 +1032,7 @@
(
groupID, _ignore_name, _ignore_membershipHash, _ignore_modDate,
_ignore_extant
- ) = yield self.transactionUnderTest().groupByUID("20000000-0000-0000-0000-000000000001")
+ ) = yield self.transactionUnderTest().groupByUID("group01")
ga = schema.GROUP_ATTENDEE
yield Insert({
ga.RESOURCE_ID: cobj._resourceID,
@@ -1041,12 +1040,12 @@
ga.MEMBERSHIP_HASH: (-1),
}
).on(self.transactionUnderTest())
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
self.assertEqual(len(wps), 1)
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_2))
@@ -1083,11 +1082,11 @@
UID:event1 at ninevah.local
DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
RRULE:FREQ=DAILY;UNTIL=20240101T100000
SUMMARY:event 1
END:VEVENT
@@ -1101,10 +1100,10 @@
BEGIN:VEVENT
UID:event1 at ninevah.local
{start}DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
{relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000
SEQUENCE:2
SUMMARY:event 1
@@ -1118,11 +1117,11 @@
BEGIN:VEVENT
{uid}DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
{relatedTo}{rule}SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -1136,25 +1135,25 @@
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 1)
+ yield self._verifyObjectResourceCount("user01", 1)
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", expandedMembers)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 1)
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cal = yield self.calendarUnderTest(name="calendar", home="user02")
cobjs = yield cal.objectResources()
for cobj in cobjs:
vcalendar = yield cobj.component()
@@ -1191,7 +1190,7 @@
#TODO: add some meaningful test
'''
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
cobjs = yield cal.objectResources()
for cobj in cobjs:
vcalendar = yield cobj.component()
@@ -1230,10 +1229,10 @@
UID:event1 at ninevah.local
DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
RRULE:FREQ=DAILY;UNTIL=20240101T100000
SUMMARY:event 1
END:VEVENT
@@ -1247,11 +1246,11 @@
BEGIN:VEVENT
UID:event1 at ninevah.local
{start}DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000001";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;MEMBER="urn:x-uid:group01";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
{relatedTo}RRULE:FREQ=DAILY;UNTIL=20240101T100000
SEQUENCE:2
SUMMARY:event 1
@@ -1265,10 +1264,10 @@
BEGIN:VEVENT
{uid}DTSTART:20120101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
+ATTENDEE;CN=User 02;EMAIL=user02 at example.com;RSVP=TRUE:urn:x-uid:user02
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
CREATED:20060101T150000Z
-ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000002
+ORGANIZER;CN=User 02;EMAIL=user02 at example.com:urn:x-uid:user02
{relatedTo}{rule}SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -1285,25 +1284,25 @@
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user02")
vcalendar = Component.fromString(data_put_1)
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user02")
vcalendar = yield cobj.component()
self.assertEqual(normalize_iCalStr(vcalendar), normalize_iCalStr(data_get_1))
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 0)
+ yield self._verifyObjectResourceCount("user01", 0)
self.patch(CalendarDirectoryRecordMixin, "expandedMembers", unpatchedExpandedMembers)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000001")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group01")
yield self.commit()
self.assertEqual(len(wps), 1)
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000002")
+ cal = yield self.calendarUnderTest(name="calendar", home="user02")
cobjs = yield cal.objectResources()
for cobj in cobjs:
vcalendar = yield cobj.component()
@@ -1338,10 +1337,10 @@
)
)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000001", 1)
+ yield self._verifyObjectResourceCount("user01", 1)
#TODO: add some meaningful test
'''
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cal = yield self.calendarUnderTest(name="calendar", home="user01")
cobjs = yield cal.objectResources()
for cobj in cobjs:
vcalendar = yield cobj.component()
@@ -1356,13 +1355,13 @@
of those groups is removed
"""
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000010", 0)
+ yield self._verifyObjectResourceCount("user06", 0)
+ yield self._verifyObjectResourceCount("user07", 0)
+ yield self._verifyObjectResourceCount("user08", 0)
+ yield self._verifyObjectResourceCount("user09", 0)
+ yield self._verifyObjectResourceCount("user10", 0)
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -1391,16 +1390,16 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:group03
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR"""
@@ -1413,15 +1412,15 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:group03
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -1436,16 +1435,16 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 01;CUTYPE=X-SERVER-GROUP;EMAIL=group01 at example.com;RSVP=TRUE:urn:x-uid:group01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:group03
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SEQUENCE:2
SUMMARY:event 1
END:VEVENT
@@ -1456,7 +1455,7 @@
@inlineCallbacks
def recordWithUID(self, uid):
- if uid == "20000000-0000-0000-0000-000000000002":
+ if uid == "group02":
result = None
else:
result = yield unpatchedRecordWithUID(self, uid)
@@ -1466,41 +1465,41 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
+ yield self._verifyObjectResourceCount("user08", 1)
+ yield self._verifyObjectResourceCount("user09", 1)
# cache group
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 3)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
yield self.commit()
self.assertEqual(len(wps), 0)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
# remove group members run cacher again
self.patch(DirectoryService, "recordWithUID", recordWithUID)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
yield self.commit()
self.assertEqual(len(wps), 1)
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_2)
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000006")
+ cal = yield self.calendarUnderTest(name="calendar", home="user06")
cobjs = yield cal.objectResources()
self.assertEqual(len(cobjs), 1)
comp = yield cobjs[0].componentForUser()
@@ -1510,16 +1509,16 @@
# add group members back, run cacher
self.patch(DirectoryService, "recordWithUID", unpatchedRecordWithUID)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
self.assertEqual(len(wps), 1)
yield self.commit()
yield JobItem.waitEmpty(self._sqlCalendarStore.newTransaction, reactor, 60)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_3)
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000006")
+ cal = yield self.calendarUnderTest(name="calendar", home="user06")
cobjs = yield cal.objectResources()
self.assertEqual(len(cobjs), 1)
comp = yield cobjs[0].componentForUser()
@@ -1535,13 +1534,13 @@
those groups is removed
"""
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 0)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000010", 0)
+ yield self._verifyObjectResourceCount("user06", 0)
+ yield self._verifyObjectResourceCount("user07", 0)
+ yield self._verifyObjectResourceCount("user08", 0)
+ yield self._verifyObjectResourceCount("user09", 0)
+ yield self._verifyObjectResourceCount("user10", 0)
- calendar = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000001")
+ calendar = yield self.calendarUnderTest(name="calendar", home="user01")
data_put_1 = """BEGIN:VCALENDAR
CALSCALE:GREGORIAN
@@ -1569,15 +1568,15 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000003
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002","urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
-ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000003";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000009
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=Group 03;CUTYPE=X-SERVER-GROUP;EMAIL=group03 at example.com;RSVP=TRUE:urn:x-uid:group03
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02","urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
+ATTENDEE;CN=User 09;EMAIL=user09 at example.com;MEMBER="urn:x-uid:group03";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user09
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SUMMARY:event 1
END:VEVENT
END:VCALENDAR"""
@@ -1607,13 +1606,13 @@
UID:event1 at ninevah.local
DTSTART:20240101T100000Z
DURATION:PT1H
-ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:10000000-0000-0000-0000-000000000001
-ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:20000000-0000-0000-0000-000000000002
-ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000006
-ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000007
-ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:20000000-0000-0000-0000-000000000002";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:10000000-0000-0000-0000-000000000008
+ATTENDEE;CN=User 01;EMAIL=user01 at example.com;RSVP=TRUE:urn:x-uid:user01
+ATTENDEE;CN=Group 02;CUTYPE=X-SERVER-GROUP;EMAIL=group02 at example.com;RSVP=TRUE:urn:x-uid:group02
+ATTENDEE;CN=User 06;EMAIL=user06 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user06
+ATTENDEE;CN=User 07;EMAIL=user07 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user07
+ATTENDEE;CN=User 08;EMAIL=user08 at example.com;MEMBER="urn:x-uid:group02";PARTSTAT=NEEDS-ACTION;RSVP=TRUE;SCHEDULE-STATUS=1.2:urn:x-uid:user08
CREATED:20060101T150000Z
-ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:10000000-0000-0000-0000-000000000001
+ORGANIZER;CN=User 01;EMAIL=user01 at example.com:urn:x-uid:user01
SEQUENCE:1
SUMMARY:event 1
END:VEVENT
@@ -1624,28 +1623,28 @@
yield calendar.createCalendarObjectWithName("data1.ics", vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
+ yield self._verifyObjectResourceCount("user08", 1)
+ yield self._verifyObjectResourceCount("user09", 1)
# cache groups
groupCacher = GroupCacher(self.transactionUnderTest().directoryService())
groupsToRefresh = yield groupCacher.groupsToRefresh(self.transactionUnderTest())
self.assertEqual(len(groupsToRefresh), 2)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
yield self.commit()
self.assertEqual(len(wps), 0)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group03")
yield self.commit()
self.assertEqual(len(wps), 0)
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_1)
@@ -1653,22 +1652,22 @@
yield cobj.setComponent(vcalendar)
yield self.commit()
- cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="10000000-0000-0000-0000-000000000001")
+ cobj = yield self.calendarObjectUnderTest(name="data1.ics", calendar_name="calendar", home="user01")
vcalendar = yield cobj.component()
self._assertICalStrEqual(vcalendar, data_get_2)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000006", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000007", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000008", 1)
- yield self._verifyObjectResourceCount("10000000-0000-0000-0000-000000000009", 1)
+ yield self._verifyObjectResourceCount("user06", 1)
+ yield self._verifyObjectResourceCount("user07", 1)
+ yield self._verifyObjectResourceCount("user08", 1)
+ yield self._verifyObjectResourceCount("user09", 1)
# groups did not change so no work proposals
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000002")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group02")
self.assertEqual(len(wps), 0)
- wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "20000000-0000-0000-0000-000000000003")
+ wps = yield groupCacher.refreshGroup(self.transactionUnderTest(), "group03")
self.assertEqual(len(wps), 0)
- cal = yield self.calendarUnderTest(name="calendar", home="10000000-0000-0000-0000-000000000009")
+ cal = yield self.calendarUnderTest(name="calendar", home="user09")
cobjs = yield cal.objectResources()
self.assertEqual(len(cobjs), 1)
comp = yield cobjs[0].componentForUser()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140715/148e8ddb/attachment-0001.html>
More information about the calendarserver-changes
mailing list