[CalendarServer-changes] [13575] CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py

source_changes at macosforge.org source_changes at macosforge.org
Fri May 30 10:23:49 PDT 2014


Revision: 13575
          http://trac.calendarserver.org//changeset/13575
Author:   cdaboo at apple.com
Date:     2014-05-30 10:23:49 -0700 (Fri, 30 May 2014)
Log Message:
-----------
Speed up a test by using random sample of records rather than all records.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py

Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2014-05-30 16:24:59 UTC (rev 13574)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py	2014-05-30 17:23:49 UTC (rev 13575)
@@ -42,6 +42,7 @@
 
 from urllib import quote
 from uuid import UUID
+import random
 
 
 class ProvisionedPrincipals(StoreTestCase):
@@ -830,16 +831,16 @@
         """
         Default access controls for principals.
         """
+        records = yield self._allRecords()
         for (
             _ignore_provisioningResource, _ignore_recordType, recordResource, _ignore_record
-        ) in (yield self._allRecords()):
-            if True:  # user.enabled:
-                for args in (
-                    yield _authReadOnlyPrivileges(
-                        self, recordResource, recordResource.principalURL()
-                    )
-                ):
-                    yield self._checkPrivileges(*args)
+        ) in records:
+            for args in (
+                yield _authReadOnlyPrivileges(
+                    self, recordResource, recordResource.principalURL(), records=random.sample(records, 10)
+                )
+            ):
+                yield self._checkPrivileges(*args)
 
 
     @inlineCallbacks
@@ -1015,20 +1016,21 @@
 
 
 @inlineCallbacks
-def _authReadOnlyPrivileges(self, resource, url):
+def _authReadOnlyPrivileges(self, resource, url, records=None):
     items = []
+    if records is None:
+        records = yield self._allRecords()
     for (
         _ignore_provisioningResource, _ignore_recordType, recordResource, _ignore_record
-    ) in (yield self._allRecords()):
-        if True:  # user.enabled:
-            items.append((
-                davxml.HRef().fromString(recordResource.principalURL()),
-                davxml.Read(), True
-            ))
-            items.append((
-                davxml.HRef().fromString(recordResource.principalURL()),
-                davxml.Write(), False
-            ))
+    ) in records:
+        items.append((
+            davxml.HRef().fromString(recordResource.principalURL()),
+            davxml.Read(), True
+        ))
+        items.append((
+            davxml.HRef().fromString(recordResource.principalURL()),
+            davxml.Write(), False
+        ))
     items.append((
         davxml.Unauthenticated(), davxml.Read(), False
     ))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140530/a74dcb10/attachment.html>


More information about the calendarserver-changes mailing list