[CalendarServer-changes] [2364] CalendarServer/branches/propfind-cache/twistedcaldav

[source_changes at macosforge.org]

Revision: 2364
          http://trac.macosforge.org/projects/calendarserver/changeset/2364
Author:   dreid at apple.com
Date:     2008-05-02 10:48:34 -0700 (Fri, 02 May 2008)

Log Message:
-----------
Update CalendarHome's property token on property changes.

Modified Paths:
--------------
    CalendarServer/branches/propfind-cache/twistedcaldav/resource.py
    CalendarServer/branches/propfind-cache/twistedcaldav/static.py
    CalendarServer/branches/propfind-cache/twistedcaldav/test/test_resource.py
    CalendarServer/branches/propfind-cache/twistedcaldav/test/test_static.py
    CalendarServer/branches/propfind-cache/twistedcaldav/test/util.py

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/resource.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/resource.py	2008-05-02 17:32:00 UTC (rev 2363)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/resource.py	2008-05-02 17:48:34 UTC (rev 2364)
@@ -218,7 +218,7 @@
         val = super(CalDAVResource, self).writeDeadProperty(property)
 
         if hasattr(self, 'cacheNotifier'):
-            self.cacheNotifier.propertiesChanged()
+            self.cacheNotifier.changed()
 
         return val
 

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/static.py	2008-05-02 17:32:00 UTC (rev 2363)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/static.py	2008-05-02 17:48:34 UTC (rev 2364)
@@ -286,9 +286,6 @@
 
     def updateCTag(self):
         assert self.isCollection()
-        if hasattr(self, 'cacheNotifier'):
-            self.cacheNotifier.dataChanged()
-
         self.writeDeadProperty(customxml.GETCTag(str(datetime.datetime.now())))
 
     ##

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/test/test_resource.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/test/test_resource.py	2008-05-02 17:32:00 UTC (rev 2363)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/test_resource.py	2008-05-02 17:48:34 UTC (rev 2364)
@@ -36,7 +36,7 @@
 
     def test_writeDeadPropertyNotifiesCache(self):
         self.resource.writeDeadProperty(StubProperty())
-        self.assertEquals(self.resource.cacheNotifier.propertyChangedCount, 1)
+        self.assertEquals(self.resource.cacheNotifier.changedCount, 1)
 
 
     def test_writeDeadPropertyWritesProperty(self):
@@ -50,7 +50,7 @@
         self.resource._dead_properties = None
         self.assertRaises(Exception,
                           self.resource.writeDeadProperty, StubProperty())
-        self.assertEquals(self.resource.cacheNotifier.propertyChangedCount, 0)
+        self.assertEquals(self.resource.cacheNotifier.changedCount, 0)
 
 
     def test_writeDeadPropertyDoesntFailWithoutACacheNotifier(self):

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/test/test_static.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/test/test_static.py	2008-05-02 17:32:00 UTC (rev 2363)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/test_static.py	2008-05-02 17:48:34 UTC (rev 2364)
@@ -47,13 +47,13 @@
         self.caldavFile = CalDAVFile(self.mktemp())
         self.caldavFile.fp.createDirectory()
         self.caldavFile.cacheNotifier = StubCacheChangeNotifier()
-        self.assertEquals(self.caldavFile.cacheNotifier.dataChangedCount, 0)
+        self.assertEquals(self.caldavFile.cacheNotifier.changedCount, 0)
         self.caldavFile.isCollection = (lambda: True)
 
 
     def test_updateCTagNotifiesCache(self):
         self.caldavFile.updateCTag()
-        self.assertEquals(self.caldavFile.cacheNotifier.dataChangedCount, 1)
+        self.assertEquals(self.caldavFile.cacheNotifier.changedCount, 1)
 
 
     def test_updateCTagDoesntFailWithoutACacheNotifier(self):

Modified: CalendarServer/branches/propfind-cache/twistedcaldav/test/util.py
===================================================================
--- CalendarServer/branches/propfind-cache/twistedcaldav/test/util.py	2008-05-02 17:32:00 UTC (rev 2363)
+++ CalendarServer/branches/propfind-cache/twistedcaldav/test/util.py	2008-05-02 17:48:34 UTC (rev 2364)
@@ -39,11 +39,7 @@
 
 
 class StubCacheChangeNotifier(object):
-    dataChangedCount = 0
-    propertyChangedCount = 0
+    changedCount = 0
 
-    def dataChanged(self):
-        self.dataChangedCount += 1
-
-    def propertiesChanged(self):
-        self.propertyChangedCount += 1
+    def changed(self):
+        self.changedCount += 1

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080502/0eb6e694/attachment-0001.html