[CalendarServer-changes] [11942] CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/ directory/test/test_directory.py

[source_changes at macosforge.org]

Revision: 11942
          http://trac.calendarserver.org//changeset/11942
Author:   gaya at apple.com
Date:     2013-11-13 14:26:35 -0800 (Wed, 13 Nov 2013)
Log Message:
-----------
fix schedulePolledGroupCachingUpdate import; pep8 whitespace

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py

Modified: CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py
===================================================================
--- CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py	2013-11-13 20:03:22 UTC (rev 11941)
+++ CalendarServer/branches/users/sagen/groupcacher/twistedcaldav/directory/test/test_directory.py	2013-11-13 22:26:35 UTC (rev 11942)
@@ -20,13 +20,14 @@
 from twistedcaldav.test.util import TestCase
 from twistedcaldav.test.util import xmlFile, augmentsFile, proxiesFile, dirTest
 from twistedcaldav.config import config
-from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, GroupMembershipCache, GroupMembershipCacheUpdater, diffAssignments, schedulePolledGroupCachingUpdate
+from twistedcaldav.directory.directory import DirectoryService, DirectoryRecord, GroupMembershipCache, GroupMembershipCacheUpdater, diffAssignments
 from twistedcaldav.directory.xmlfile import XMLDirectoryService
 from twistedcaldav.directory.calendaruserproxyloader import XMLCalendarUserProxyLoader
 from twistedcaldav.directory import augment, calendaruserproxy
 from twistedcaldav.directory.util import normalizeUUID
 from twistedcaldav.directory.principal import DirectoryPrincipalProvisioningResource
 from txdav.common.datastore.test.util import buildStore
+from twext.who.groups import schedulePolledGroupCachingUpdate
 
 import cPickle as pickle
 import uuid
@@ -121,7 +122,6 @@
         self.count += 1
 
 
-
     def test_expandedMembers(self):
         """
         Make sure expandedMembers( ) returns a complete, flattened set of
@@ -889,7 +889,7 @@
         }
         members = pickle.loads(snapshotFile.getContent())
         self.assertEquals(members, expected)
-        
+
         # "Corrupt" the snapshot and verify it is regenerated properly
         snapshotFile.setContent("xyzzy")
         cache.delete("group-cacher-populated")
@@ -900,8 +900,8 @@
         self.assertTrue(snapshotFile.exists())
         members = pickle.loads(snapshotFile.getContent())
         self.assertEquals(members, expected)
-        
 
+
     def test_autoAcceptMembers(self):
         """
         autoAcceptMembers( ) returns an empty list if no autoAcceptGroup is
@@ -926,6 +926,7 @@
             ])
         )
 
+
     @inlineCallbacks
     def testScheduling(self):
         """
@@ -945,15 +946,19 @@
 
     testScheduling.skip = "Fix WorkProposal to track delayed calls and cancel them"
 
+
+
 class StubGroupCacher(object):
     def __init__(self):
         self.called = False
         self.updateSeconds = 99
 
+
     def updateCache(self):
         self.called = True
 
 
+
 class RecordsMatchingTokensTests(TestCase):
 
     @inlineCallbacks
@@ -1038,6 +1043,7 @@
         )
 
 
+
 class GUIDTests(TestCase):
 
     def setUp(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/0e967a88/attachment.html>