May 2012 - calendarserver-changes - lists.macosforge.org

[9321] CalendarServer/trunk
by source_changes＠macosforge.org 31 May '12

31 May '12

Revision: 9321 http://trac.macosforge.org/projects/calendarserver/changeset/9321 Author: glyph(a)apple.com Date: 2012-05-31 16:06:57 -0700 (Thu, 31 May 2012) Log Message: ----------- slightly more permissive work-avoidance in the upgrade Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql.py Property Changed: ---------------- CalendarServer/trunk/ Modified: CalendarServer/trunk/txdav/common/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-31 22:50:07 UTC (rev 9320) +++ CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-31 23:06:57 UTC (rev 9321) @@ -4254,6 +4254,30 @@ @inlineCallbacks +def _needsNormalizationUpgrade(txn): + """ + Determine whether a given store requires a UUID normalization data upgrade. + + @param txn: the transaction to use + @type txn: L{CommonStoreTransaction} + + @return: a L{Deferred} that fires with C{True} or C{False} depending on + whether we need the normalization upgrade or not. + """ + for x in [schema.CALENDAR_HOME, schema.ADDRESSBOOK_HOME, + schema.NOTIFICATION_HOME]: + slct = Select([x.OWNER_UID], From=x, + Where=x.OWNER_UID != Upper(x.OWNER_UID)) + rows = yield slct.on(txn) + if rows: + for [uid] in rows: + if normalizeUUIDOrNot(uid) != uid: + returnValue(True) + returnValue(False) + + + +@inlineCallbacks def fixUUIDNormalization(store): """ Fix all UUIDs in the given SQL store to be in a canonical form; @@ -4261,18 +4285,11 @@ """ t = store.newTransaction(disableCache=True) - # First, let's see if there are any calendar or addressbook homes that have - # a lower-case OWNER_UID. If there are none, then we can early-out and - # avoid the tedious and potentially expensive inspection of oodles of - # calendar data. - for x in [schema.CALENDAR_HOME, schema.ADDRESSBOOK_HOME, - schema.NOTIFICATION_HOME]: - slct = Select([x.OWNER_UID], From=x, - Where=x.OWNER_UID != Upper(x.OWNER_UID)) - rows = yield slct.on(t) - if rows: - break - else: + # First, let's see if there are any calendar, addressbook, or notification + # homes that have a de-normalized OWNER_UID. If there are none, then we can + # early-out and avoid the tedious and potentially expensive inspection of + # oodles of calendar data. + if not (yield _needsNormalizationUpgrade(t)): log.msg("No potentially denormalized UUIDs detected, " "skipping normalization upgrade.") yield t.abort()

1 0

[9320] CalendarServer/trunk
by source_changes＠macosforge.org 31 May '12

31 May '12

Revision: 9320 http://trac.macosforge.org/projects/calendarserver/changeset/9320 Author: glyph(a)apple.com Date: 2012-05-31 15:50:07 -0700 (Thu, 31 May 2012) Log Message: ----------- Fix and test for denormalized notification home UUIDs. Test for denormalized addressbook UUIDs, just in case. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql.py CalendarServer/trunk/txdav/common/datastore/test/test_sql.py Property Changed: ---------------- CalendarServer/trunk/ Modified: CalendarServer/trunk/txdav/common/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-31 21:04:04 UTC (rev 9319) +++ CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-31 22:50:07 UTC (rev 9320) @@ -438,11 +438,11 @@ @memoizedKey("uid", "_notificationHomes") - def notificationsWithUID(self, uid): + def notificationsWithUID(self, uid, create=True): """ Implement notificationsWithUID. """ - return NotificationCollection.notificationsWithUID(self, uid) + return NotificationCollection.notificationsWithUID(self, uid, create) @classproperty def _insertAPNSubscriptionQuery(cls): #@NoSelf @@ -3443,15 +3443,15 @@ @classmethod @inlineCallbacks - def notificationsWithUID(cls, txn, uid): + def notificationsWithUID(cls, txn, uid, create): rows = yield cls._resourceIDFromUIDQuery.on(txn, uid=uid) if rows: resourceID = rows[0][0] created = False - else: - # Use savepoint so we can do a partial rollback if there is a race condition - # where this row has already been inserted + elif create: + # Use savepoint so we can do a partial rollback if there is a race + # condition where this row has already been inserted savepoint = SavepointAction("notificationsWithUID") yield savepoint.acquire(txn) @@ -3459,9 +3459,11 @@ resourceID = str(( yield cls._provisionNewNotificationsQuery.on(txn, uid=uid) )[0][0]) - except Exception: # FIXME: Really want to trap the pg.DatabaseError but in a non-DB specific manner + except Exception: + # FIXME: Really want to trap the pg.DatabaseError but in a non- + # DB specific manner yield savepoint.rollback(txn) - + # Retry the query - row may exist now, if not re-raise rows = yield cls._resourceIDFromUIDQuery.on(txn, uid=uid) if rows: @@ -3472,7 +3474,8 @@ else: created = True yield savepoint.release(txn) - + else: + returnValue(None) collection = cls(txn, uid, resourceID) yield collection._loadPropertyStore() if created: @@ -4137,10 +4140,7 @@ homeType=homeTypeName ) other = None - if homeType == ENOTIFICATIONTYPE: - this = yield t.notificationsWithUID(UID) - else: - this = yield t.homeWithUID(homeType, UID) + this = yield _getHome(t, homeType, UID) if homeType == ECALENDARTYPE: fixedThisHome = yield fixOneCalendarHome(this) else: @@ -4159,7 +4159,7 @@ log_msg(format="Detected case variance: %(uid)s %(newuid)s" "[%(homeType)s]", uid=UID, newuid=newname, homeType=homeTypeName) - other = yield t.homeWithUID(homeType, newname) + other = yield _getHome(t, homeType, newname) if other is None: # No duplicate: just fix the name. yield _renameHome(t, homeTable, UID, newname) @@ -4181,6 +4181,30 @@ +def _getHome(txn, homeType, uid): + """ + Like L{CommonHome.homeWithUID} but also honoring ENOTIFICATIONTYPE which + isn't I{really} a type of home. + + @param txn: the transaction to retrieve the home from + @type txn: L{CommonStoreTransaction} + + @param homeType: L{ENOTIFICATIONTYPE}, L{ECALENDARTYPE}, or + L{EADDRESSBOOKTYPE}. + + @param uid: the UID of the home to retrieve. + @type uid: L{str} + + @return: a L{Deferred} that fires with the L{CommonHome} or + L{NotificationHome} when it has been retrieved. + """ + if homeType == ENOTIFICATIONTYPE: + return txn.notificationsWithUID(uid, create=False) + else: + return txn.homeWithUID(homeType, uid) + + + @inlineCallbacks def _normalizeColumnUUIDs(txn, column): """ @@ -4241,7 +4265,8 @@ # a lower-case OWNER_UID. If there are none, then we can early-out and # avoid the tedious and potentially expensive inspection of oodles of # calendar data. - for x in [schema.CALENDAR_HOME, schema.ADDRESSBOOK_HOME]: + for x in [schema.CALENDAR_HOME, schema.ADDRESSBOOK_HOME, + schema.NOTIFICATION_HOME]: slct = Select([x.OWNER_UID], From=x, Where=x.OWNER_UID != Upper(x.OWNER_UID)) rows = yield slct.on(t) Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-05-31 21:04:04 UTC (rev 9319) +++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-05-31 22:50:07 UTC (rev 9320) @@ -339,13 +339,12 @@ @inlineCallbacks - def allHomeUIDs(self): + def allHomeUIDs(self, table=schema.CALENDAR_HOME): """ Get a listing of all UIDs in the current store. """ - results = yield Select( - [schema.CALENDAR_HOME.OWNER_UID], - From=schema.CALENDAR_HOME).on(self.transactionUnderTest()) + results = yield (Select([table.OWNER_UID], From=table) + .on(self.transactionUnderTest())) yield self.commit() returnValue(results) @@ -364,6 +363,37 @@ self.assertEqual((yield self.allHomeUIDs()), [[normalizedUID]]) + @inlineCallbacks + def test_fixUUIDNormalization_lowerToUpper_notification(self): + """ + L{fixUUIDNormalization} will fix the normalization of UUIDs. If a home + is found with the wrong case but no duplicate, it will simply be + upper-cased. + """ + t1 = self.transactionUnderTest() + yield t1.notificationsWithUID(denormalizedUID, create=True) + yield self.commit() + yield fixUUIDNormalization(self.storeUnderTest()) + self.assertEqual((yield self.allHomeUIDs(schema.NOTIFICATION_HOME)), + [[normalizedUID]]) + + + @inlineCallbacks + def test_fixUUIDNormalization_lowerToUpper_addressbook(self): + """ + L{fixUUIDNormalization} will fix the normalization of UUIDs. If a home + is found with the wrong case but no duplicate, it will simply be + upper-cased. + """ + t1 = self.transactionUnderTest() + yield t1.addressbookHomeWithUID(denormalizedUID, create=True) + yield self.commit() + yield fixUUIDNormalization(self.storeUnderTest()) + self.assertEqual((yield self.allHomeUIDs(schema.ADDRESSBOOK_HOME)), + [[normalizedUID]]) + + + from uuid import UUID exampleUID = UUID("a"*32) denormalizedUID = str(exampleUID)

1 0

[9319] CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py
by source_changes＠macosforge.org 31 May '12

31 May '12

Revision: 9319 http://trac.macosforge.org/projects/calendarserver/changeset/9319 Author: cdaboo(a)apple.com Date: 2012-05-31 14:04:04 -0700 (Thu, 31 May 2012) Log Message: ----------- Treat repeat=1 as a valid range expansion. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py Modified: CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py =================================================================== --- CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2012-05-31 17:46:35 UTC (rev 9318) +++ CalendarServer/trunk/twistedcaldav/directory/xmlaccountsparser.py 2012-05-31 21:04:04 UTC (rev 9319) @@ -127,11 +127,11 @@ if child.hasAttribute(ATTRIBUTE_REPEAT): repeat = int(child.getAttribute(ATTRIBUTE_REPEAT)) else: - repeat = 1 + repeat = 0 principal = XMLAccountRecord(recordType) principal.parseXML(child) - if repeat > 1: + if repeat > 0: for i in xrange(1, repeat+1): newprincipal = principal.repeat(i) self.items[recordType][newprincipal.shortNames[0]] = newprincipal

1 0

[9318] CalendarServer/trunk/twistedcaldav
by source_changes＠macosforge.org 31 May '12

31 May '12

Revision: 9318 http://trac.macosforge.org/projects/calendarserver/changeset/9318 Author: cdaboo(a)apple.com Date: 2012-05-31 10:46:35 -0700 (Thu, 31 May 2012) Log Message: ----------- Make sure we don't keeping expanding instances when we have a valid cache. Modified Paths: -------------- CalendarServer/trunk/twistedcaldav/ical.py CalendarServer/trunk/twistedcaldav/test/test_icalendar.py Modified: CalendarServer/trunk/twistedcaldav/ical.py =================================================================== --- CalendarServer/trunk/twistedcaldav/ical.py 2012-05-31 00:06:04 UTC (rev 9317) +++ CalendarServer/trunk/twistedcaldav/ical.py 2012-05-31 17:46:35 UTC (rev 9318) @@ -1025,7 +1025,9 @@ def cacheExpandedTimeRanges(self, limit, ignoreInvalidInstances=False): """ Expand instances up to the specified limit and cache the results in this object - so we can return cached results in the future. + so we can return cached results in the future. The limit value is the actual value + that the requester needs, but we will cache an addition 365-days worth to give us some + breathing room to return results for future instances. @param limit: the max datetime to cache up to. @type limit: L{PyCalendarDateTime} @@ -1039,8 +1041,11 @@ # so return cached instances return self.cachedInstances - self.cachedInstances = self.expandTimeRanges(limit, - ignoreInvalidInstances=ignoreInvalidInstances) + lookAheadLimit = limit + PyCalendarDuration(days=365) + self.cachedInstances = self.expandTimeRanges( + lookAheadLimit, + ignoreInvalidInstances=ignoreInvalidInstances + ) return self.cachedInstances def expandTimeRanges(self, limit, ignoreInvalidInstances=False, normalizeFunction=normalizeForIndex): @@ -1182,9 +1187,7 @@ # Check whether we have a truncated RRULE rrules = master.properties("RRULE") if len(tuple(rrules)): - limit = rid.duplicate() - limit += PyCalendarDuration(days=365) - instances = self.cacheExpandedTimeRanges(limit) + instances = self.cacheExpandedTimeRanges(rid) rids = set([instances[key].rid for key in instances]) instance_rid = normalizeForIndex(rid) if instance_rid not in rids: @@ -1243,6 +1246,7 @@ valid = set() non_master_rids = [rid for rid in rids if rid is not None] if non_master_rids: + # Pre-cache instance expansion up to the highest rid highest_rid = max(non_master_rids) self.cacheExpandedTimeRanges( highest_rid + PyCalendarDuration(days=1), @@ -1271,7 +1275,7 @@ # Get expansion instances = self.cacheExpandedTimeRanges( - rid + PyCalendarDuration(days=1), + rid, ignoreInvalidInstances=ignoreInvalidInstances ) new_rids = set([instances[key].rid for key in instances]) Modified: CalendarServer/trunk/twistedcaldav/test/test_icalendar.py =================================================================== --- CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2012-05-31 00:06:04 UTC (rev 9317) +++ CalendarServer/trunk/twistedcaldav/test/test_icalendar.py 2012-05-31 17:46:35 UTC (rev 9318) @@ -4161,6 +4161,45 @@ derived = str(derived).replace("\r", "") if derived else None self.assertEqual(derived, result, "Failed derive instance test: %s" % (title,)) + def test_derive_instance_cache(self): + """ + Test that derivation of instances only triggers an instance cache re-expansion when it + goes past the end of the last cache. + """ + + event = """BEGIN:VCALENDAR +VERSION:2.0 +PRODID:-//CALENDARSERVER.ORG//NONSGML Version 1//EN +BEGIN:VEVENT +UID:12345-67890-1 +DTSTART:20090101T080000Z +DTEND:20090101T090000Z +DTSTAMP:20080601T120000Z +RRULE:FREQ=DAILY +END:VEVENT +END:VCALENDAR +""" + + ical = Component.fromString(event) + self.assertFalse(hasattr(ical, "cachedInstances")) + + # Derive one day apart - no re-cache + ical.deriveInstance(PyCalendarDateTime(2009, 1, 2, 8, 0, 0, tzid=PyCalendarTimezone(utc=True))) + self.assertTrue(hasattr(ical, "cachedInstances")) + oldLimit = ical.cachedInstances.limit + ical.deriveInstance(PyCalendarDateTime(2009, 1, 3, 8, 0, 0, tzid=PyCalendarTimezone(utc=True))) + self.assertEqual(ical.cachedInstances.limit, oldLimit) + + # Derive several years ahead - re-cached + ical.deriveInstance(PyCalendarDateTime(2011, 1, 1, 8, 0, 0, tzid=PyCalendarTimezone(utc=True))) + self.assertNotEqual(ical.cachedInstances.limit, oldLimit) + oldLimit = ical.cachedInstances.limit + + # Check one day ahead again - no re-cache + ical.deriveInstance(PyCalendarDateTime(2011, 1, 2, 8, 0, 0, tzid=PyCalendarTimezone(utc=True))) + self.assertEqual(ical.cachedInstances.limit, oldLimit) + + def test_truncate_recurrence(self): data = (

1 0

[9317] CalendarServer/trunk
by source_changes＠macosforge.org 31 May '12

31 May '12

Revision: 9317 http://trac.macosforge.org/projects/calendarserver/changeset/9317 Author: glyph(a)apple.com Date: 2012-05-30 17:06:04 -0700 (Wed, 30 May 2012) Log Message: ----------- Test and fix for UUID normalization when there is no de-normalized duplicate. Modified Paths: -------------- CalendarServer/trunk/txdav/common/datastore/sql.py CalendarServer/trunk/txdav/common/datastore/test/test_sql.py Property Changed: ---------------- CalendarServer/trunk/ Modified: CalendarServer/trunk/txdav/common/datastore/sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-30 20:37:14 UTC (rev 9316) +++ CalendarServer/trunk/txdav/common/datastore/sql.py 2012-05-31 00:06:04 UTC (rev 9317) @@ -4045,25 +4045,48 @@ both.append([other, (yield determineNewest(other.uid(), homeType).on(sqlTxn))]) both.sort(key=lambda x: x[1]) - # Note: determineNewest may return None sometimes. + older = both[0][0] newer = both[1][0] yield migrateHome(older, newer, merge=True) # Rename the old one to 'old.<correct-guid>' newNormalized = normalizeUUIDOrNot(newer.uid()) oldNormalized = normalizeUUIDOrNot(older.uid()) - yield Update({homeTable.OWNER_UID: "old." + oldNormalized}, - Where=homeTable.OWNER_UID == older.uid()).on(sqlTxn) + yield _renameHome(sqlTxn, homeTable, older.uid(), "old." + oldNormalized) # Rename the new one to '<correct-guid>' if newer.uid() != newNormalized: - yield Update( - {homeTable.OWNER_UID: newNormalized}, - Where=homeTable.OWNER_UID == newer.uid() - ).on(sqlTxn) + yield _renameHome(sqlTxn, homeTable, newer.uid(), newNormalized) yield returnValue(newer) +def _renameHome(txn, table, oldUID, newUID): + """ + Rename a calendar, addressbook, or notification home. Note that this + function is only safe in transactions that have had caching disabled, and + more specifically should only ever be used during upgrades. Running this + in a normal transaction will have unpredictable consequences, especially + with respect to memcache. + + @param txn: an SQL transaction to use for this update + @type txn: L{twext.enterprise.ienterprise.IAsyncTransaction} + + @param table: the storage table of the desired home type + @type table: L{TableSyntax} + + @param oldUID: the old UID, the existing home's UID + @type oldUID: L{str} + + @param newUID: the new UID, to change the UID to + @type newUID: L{str} + + @return: a L{Deferred} which fires when the home is renamed. + """ + return Update({table.OWNER_UID: newUID}, + Where=table.OWNER_UID == oldUID).on(txn) + + + def _dontBotherWithNotifications(older, newer, merge): """ Notifications are more transient and can be easily worked around; don't @@ -4137,13 +4160,15 @@ "[%(homeType)s]", uid=UID, newuid=newname, homeType=homeTypeName) other = yield t.homeWithUID(homeType, newname) - if homeType == ECALENDARTYPE: - fixedOtherHome = yield fixOneCalendarHome(other) - if other is not None: + if other is None: + # No duplicate: just fix the name. + yield _renameHome(t, homeTable, UID, newname) + else: + if homeType == ECALENDARTYPE: + fixedOtherHome = yield fixOneCalendarHome(other) this = yield mergeHomes(t, this, other, homeType) - # NOTE: WE MUST NOT TOUCH EITHER HOME OBJECT AFTER THIS - # POINT. THE UIDS HAVE CHANGED AND ALL OPERATIONS WILL - # FAIL. + # NOTE: WE MUST NOT TOUCH EITHER HOME OBJECT AFTER THIS POINT. + # THE UIDS HAVE CHANGED AND ALL OPERATIONS WILL FAIL. end = time.time() elapsed = end - start Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py =================================================================== --- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-05-30 20:37:14 UTC (rev 9316) +++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2012-05-31 00:06:04 UTC (rev 9317) @@ -21,7 +21,7 @@ from twext.enterprise.dal.syntax import Select from txdav.xml import element as davxml -from twisted.internet.defer import inlineCallbacks +from twisted.internet.defer import inlineCallbacks, returnValue from twisted.internet.task import Clock from twisted.trial.unittest import TestCase @@ -32,6 +32,7 @@ from txdav.common.datastore.test.util import CommonCommonTests, buildStore from txdav.common.icommondatastore import AllRetriesFailed from twext.enterprise.dal.syntax import Insert +from txdav.common.datastore.sql import fixUUIDNormalization class CommonSQLStoreTests(CommonCommonTests, TestCase): """ @@ -335,3 +336,36 @@ [2, "fdsa", "another-value", "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA"]] ) + + + @inlineCallbacks + def allHomeUIDs(self): + """ + Get a listing of all UIDs in the current store. + """ + results = yield Select( + [schema.CALENDAR_HOME.OWNER_UID], + From=schema.CALENDAR_HOME).on(self.transactionUnderTest()) + yield self.commit() + returnValue(results) + + + @inlineCallbacks + def test_fixUUIDNormalization_lowerToUpper(self): + """ + L{fixUUIDNormalization} will fix the normalization of UUIDs. If a home + is found with the wrong case but no duplicate, it will simply be + upper-cased. + """ + t1 = self.transactionUnderTest() + yield t1.calendarHomeWithUID(denormalizedUID, create=True) + yield self.commit() + yield fixUUIDNormalization(self.storeUnderTest()) + self.assertEqual((yield self.allHomeUIDs()), [[normalizedUID]]) + + +from uuid import UUID +exampleUID = UUID("a"*32) +denormalizedUID = str(exampleUID) +normalizedUID = denormalizedUID.upper() +

1 0

[9316] CalendarServer/trunk/contrib/migration/calendarmigrator.py
by source_changes＠macosforge.org 30 May '12

30 May '12

Revision: 9316 http://trac.macosforge.org/projects/calendarserver/changeset/9316 Author: sagen(a)apple.com Date: 2012-05-30 13:37:14 -0700 (Wed, 30 May 2012) Log Message: ----------- Migration will now go ahead and merge in previous system config, even if new plist exists Modified Paths: -------------- CalendarServer/trunk/contrib/migration/calendarmigrator.py Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py =================================================================== --- CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 20:16:59 UTC (rev 9315) +++ CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 20:37:14 UTC (rev 9316) @@ -291,11 +291,9 @@ newConfigDir = os.path.join(options.targetRoot, NEW_CONFIG_DIR) newConfigFile = os.path.join(newConfigDir, CALDAVD_PLIST) - if os.path.exists(newConfigDir): - if os.path.exists(newConfigFile): - log("Calendar configuration already exists in %s" % (newConfigDir,)) - return - else: + + # Create config directory if it doesn't exist + if not os.path.exists(newConfigDir): os.mkdir(newConfigDir) defaultConfig = os.path.join(SERVER_APP_ROOT, CALDAVD_CONFIG_DIR, CALDAVD_PLIST)

1 0

[9315] CalendarServer/trunk/contrib/migration/calendarmigrator.py
by source_changes＠macosforge.org 30 May '12

30 May '12

Revision: 9315 http://trac.macosforge.org/projects/calendarserver/changeset/9315 Author: sagen(a)apple.com Date: 2012-05-30 13:16:59 -0700 (Wed, 30 May 2012) Log Message: ----------- Allow config migration to continue if the config directory exists but the plist doesn't Modified Paths: -------------- CalendarServer/trunk/contrib/migration/calendarmigrator.py Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py =================================================================== --- CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 18:19:34 UTC (rev 9314) +++ CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 20:16:59 UTC (rev 9315) @@ -294,7 +294,7 @@ if os.path.exists(newConfigDir): if os.path.exists(newConfigFile): log("Calendar configuration already exists in %s" % (newConfigDir,)) - return + return else: os.mkdir(newConfigDir)

1 0

[9314] CalendarServer/trunk/contrib/migration/calendarmigrator.py
by source_changes＠macosforge.org 30 May '12

30 May '12

Revision: 9314 http://trac.macosforge.org/projects/calendarserver/changeset/9314 Author: sagen(a)apple.com Date: 2012-05-30 11:19:34 -0700 (Wed, 30 May 2012) Log Message: ----------- Fix log args Modified Paths: -------------- CalendarServer/trunk/contrib/migration/calendarmigrator.py Modified: CalendarServer/trunk/contrib/migration/calendarmigrator.py =================================================================== --- CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 17:23:34 UTC (rev 9313) +++ CalendarServer/trunk/contrib/migration/calendarmigrator.py 2012-05-30 18:19:34 UTC (rev 9314) @@ -372,7 +372,7 @@ writePlist(newCalDAVDPlist, newConfigFile) for key, value in adminChanges: - log("Setting %s to %s via serveradmin...") + log("Setting %s to %s via serveradmin..." % (key, value)) ret = subprocess.call([SERVER_ADMIN, "settings", "calendar:%s=%s" % (key, value)]) log("serveradmin exited with %d" % (ret,))

1 0

[9313] CalendarServer/trunk/contrib/performance
by source_changes＠macosforge.org 30 May '12

30 May '12

Revision: 9313 http://trac.macosforge.org/projects/calendarserver/changeset/9313 Author: cdaboo(a)apple.com Date: 2012-05-30 10:23:34 -0700 (Wed, 30 May 2012) Log Message: ----------- Auth types are not case-sensitive. Modified Paths: -------------- CalendarServer/trunk/contrib/performance/httpauth.py Added Paths: ----------- CalendarServer/trunk/contrib/performance/test_httpauth.py Modified: CalendarServer/trunk/contrib/performance/httpauth.py =================================================================== --- CalendarServer/trunk/contrib/performance/httpauth.py 2012-05-30 17:23:01 UTC (rev 9312) +++ CalendarServer/trunk/contrib/performance/httpauth.py 2012-05-30 17:23:34 UTC (rev 9313) @@ -104,7 +104,7 @@ challengeType = { 'basic': BasicChallenge, 'digest': DigestChallenge, - }.get(scheme) + }.get(scheme.lower()) if challengeType is None: return None return challengeType(**args) Added: CalendarServer/trunk/contrib/performance/test_httpauth.py =================================================================== --- CalendarServer/trunk/contrib/performance/test_httpauth.py (rev 0) +++ CalendarServer/trunk/contrib/performance/test_httpauth.py 2012-05-30 17:23:34 UTC (rev 9313) @@ -0,0 +1,40 @@ +## +# Copyright (c) 2012 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. +## + +from twisted.trial.unittest import TestCase +from httpauth import AuthHandlerAgent + +class HTTPAuthTests(TestCase): + + + def test_AuthHandlerAgent_parse(self): + """ + Make sure auth method is handled case-insensitively. + """ + headers = ( + "Basic realm=\"foo\"", + "basic realm=\"foo\"", + "BASIC realm=\"foo\"", + "Digest realm=\"foo\"", + "digest realm=\"foo\"", + "DIGEST realm=\"foo\"", + ) + + for hdrvalue in headers: + + hdlr = AuthHandlerAgent(None, None) + ch = hdlr._parse(hdrvalue) + self.assertTrue(ch is not None)

1 0

[9312] CalendarServer/trunk/contrib/performance/loadtest
by source_changes＠macosforge.org 30 May '12

30 May '12

Revision: 9312 http://trac.macosforge.org/projects/calendarserver/changeset/9312 Author: cdaboo(a)apple.com Date: 2012-05-30 10:23:01 -0700 (Wed, 30 May 2012) Log Message: ----------- Fix some tests. Modified Paths: -------------- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py CalendarServer/trunk/contrib/performance/loadtest/test_sim.py Modified: CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py =================================================================== --- CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2012-05-30 17:22:48 UTC (rev 9311) +++ CalendarServer/trunk/contrib/performance/loadtest/test_profiles.py 2012-05-30 17:23:01 UTC (rev 9312) @@ -316,7 +316,7 @@ """ def setUp(self): self.sim = CalendarClientSimulator( - AnyUser(), Populator(None), None, None, None, None) + AnyUser(), Populator(None), None, None, None, None, None) def _simpleAccount(self, userNumber, eventText): @@ -516,7 +516,7 @@ """ def setUp(self): self.sim = CalendarClientSimulator( - AnyUser(), Populator(None), None, None, None, None) + AnyUser(), Populator(None), None, None, None, None, None) def _simpleAccount(self, userNumber, eventText): @@ -685,7 +685,7 @@ """ def setUp(self): self.sim = CalendarClientSimulator( - AnyUser(), Populator(None), None, None, None, None) + AnyUser(), Populator(None), None, None, None, None, None) def test_enabled(self): @@ -949,7 +949,7 @@ """ def setUp(self): self.sim = CalendarClientSimulator( - AnyUser(), Populator(None), None, None, None, None) + AnyUser(), Populator(None), None, None, None, None, None) def test_enabled(self): Modified: CalendarServer/trunk/contrib/performance/loadtest/test_sim.py =================================================================== --- CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2012-05-30 17:22:48 UTC (rev 9311) +++ CalendarServer/trunk/contrib/performance/loadtest/test_sim.py 2012-05-30 17:23:01 UTC (rev 9312) @@ -117,7 +117,7 @@ """ calsim = CalendarClientSimulator( [self._user('alice'), self._user('bob'), self._user('carol')], - Populator(None), None, None, 'http://example.org:1234/', None) + Populator(None), None, None, 'http://example.org:1234/', None, None) users = sorted([ calsim._createUser(0)[0], calsim._createUser(1)[0], @@ -133,7 +133,7 @@ """ calsim = CalendarClientSimulator( [self._user('alice')], - Populator(None), None, None, 'http://example.org:1234/', None) + Populator(None), None, None, 'http://example.org:1234/', None, None) user, auth = calsim._createUser(0) self.assertEqual( auth.passwd.find_user_password('Test Realm', 'http://example.org:1234/')[1], @@ -146,7 +146,7 @@ profiles are not logged. """ class BrokenClient(object): - def __init__(self, reactor, serverAddress, principalPathTemplate, userInfo, auth, runResult): + def __init__(self, reactor, serverAddress, principalPathTemplate, serializationPath, userInfo, auth, runResult): self._runResult = runResult def run(self): @@ -171,7 +171,7 @@ BrokenClient, {'runResult': clientRunResult}, [ProfileType(BrokenProfile, {'runResult': profileRunResult})])) sim = CalendarClientSimulator( - [self._user('alice')], Populator(None), params, None, 'http://example.com:1234/', None) + [self._user('alice')], Populator(None), params, None, 'http://example.com:1234/', None, None) sim.add(1, 1) sim.stop() clientRunResult.errback(RuntimeError("Some fictional client problem")) @@ -248,7 +248,7 @@ exc = self.assertRaises( SystemExit, StubSimulator.main, ['--config', config.path]) self.assertEquals( - exc.args, (StubSimulator(None, None, None, None, None).run(),)) + exc.args, (StubSimulator(None, None, None, None, None, None).run(),)) def test_createSimulator(self): @@ -259,7 +259,7 @@ """ server = 'http://127.0.0.7:1243/' reactor = object() - sim = LoadSimulator(server, None, None, None, None, reactor=reactor) + sim = LoadSimulator(server, None, None, None, None, None, reactor=reactor) calsim = sim.createSimulator() self.assertIsInstance(calsim, CalendarClientSimulator) self.assertIsInstance(calsim.reactor, LagTrackingReactor) @@ -439,7 +439,7 @@ reactor = object() sim = LoadSimulator( - None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor) + None, None, None, None, Arrival(FakeArrival, {'x': 3, 'y': 2}), None, reactor=reactor) arrival = sim.createArrivalPolicy() self.assertIsInstance(arrival, FakeArrival) self.assertIdentical(arrival.reactor, sim.reactor) @@ -501,7 +501,7 @@ """ config = FilePath(self.mktemp()) config.setContent(writePlistToString({ - "observers": {"type":"contrib.performance.loadtest.population.SimpleStatistics"} + "observers": [{"type":"contrib.performance.loadtest.population.SimpleStatistics", "params":{},},] })) sim = LoadSimulator.fromCommandLine(['--config', config.path]) self.assertEquals(len(sim.observers), 1) @@ -519,6 +519,7 @@ "http://example.com:123/", "/principals/users/%s/", None, + None, Arrival(lambda reactor: NullArrival(), {}), None, observers, reactor=Reactor()) io = StringIO()

1 0