[CalendarServer-changes] [14280] CalendarServer/trunk/txdav/who/test/test_delegates.py

[source_changes at macosforge.org]

Revision: 14280
          http://trac.calendarserver.org//changeset/14280
Author:   cdaboo at apple.com
Date:     2015-01-09 07:30:27 -0800 (Fri, 09 Jan 2015)
Log Message:
-----------
Try to fix an intermittent test failure.

Modified Paths:
--------------
    CalendarServer/trunk/txdav/who/test/test_delegates.py

Modified: CalendarServer/trunk/txdav/who/test/test_delegates.py
===================================================================
--- CalendarServer/trunk/txdav/who/test/test_delegates.py	2015-01-08 22:17:27 UTC (rev 14279)
+++ CalendarServer/trunk/txdav/who/test/test_delegates.py	2015-01-09 15:30:27 UTC (rev 14280)
@@ -34,7 +34,9 @@
         self.store = self.storeUnderTest()
         self.groupCacher = GroupCacher(self.directory)
 
+        yield Delegates._memcacher.flushAll()
 
+
     @inlineCallbacks
     def test_recordCreation(self):
         """
@@ -301,7 +303,9 @@
         self.store = self.storeUnderTest()
         self.groupCacher = GroupCacher(self.directory)
 
+        yield Delegates._memcacher.flushAll()
 
+
     @inlineCallbacks
     def _memcacherMemberResults(self, delegate, readWrite, expanded, results):
         delegateUIDs = yield Delegates._memcacher.getMembers(delegate.uid, readWrite, expanded)
@@ -385,8 +389,6 @@
     @inlineCallbacks
     def test_cacheUsed(self):
 
-        yield Delegates._memcacher.flushAll()
-
         delegator = yield self.directory.recordWithUID(u"__wsanchez1__")
         delegate1 = yield self.directory.recordWithUID(u"__sagen1__")
 
@@ -441,8 +443,6 @@
     @inlineCallbacks
     def test_addRemoveDelegation(self):
 
-        yield Delegates._memcacher.flushAll()
-
         delegator = yield self.directory.recordWithUID(u"__wsanchez1__")
         delegate1 = yield self.directory.recordWithUID(u"__sagen1__")
         delegate2 = yield self.directory.recordWithUID(u"__cdaboo1__")
@@ -555,8 +555,6 @@
     @inlineCallbacks
     def test_setDelegation(self):
 
-        yield Delegates._memcacher.flushAll()
-
         delegator = yield self.directory.recordWithUID(u"__wsanchez1__")
         delegates = [
             (yield self.directory.recordWithUID(u"__sagen1__")),
@@ -665,8 +663,6 @@
     @inlineCallbacks
     def test_setGroupDelegation(self):
 
-        yield Delegates._memcacher.flushAll()
-
         delegator = yield self.directory.recordWithUID(u"__wsanchez1__")
         delegates = [
             (yield self.directory.recordWithUID(u"__sagen1__")),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150109/0f76bfee/attachment-0001.html>