[prev in list] [next in list] [prev in thread] [next in thread]
List: calendarserver-changes
Subject: [CalendarServer-changes] [13575] CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py
From: source_changes () macosforge ! org
Date: 2014-05-30 17:23:49
Message-ID: 20140530172350.055CF140ED4 () svn ! calendarserver ! org
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
Revision: 13575
http://trac.calendarserver.org//changeset/13575
Author: cdaboo@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
))
[Attachment #5 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[13575] CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://trac.calendarserver.org//changeset/13575">13575</a></dd> <dt>Author</dt> \
<dd>cdaboo@apple.com</dd> <dt>Date</dt> <dd>2014-05-30 10:23:49 -0700 (Fri, 30 May \
2014)</dd> </dl>
<h3>Log Message</h3>
<pre>Speed up a test by using random sample of records rather than all records.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_principalpy">CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_principalpy"></a>
<div class="modfile"><h4>Modified: \
CalendarServer/trunk/twistedcaldav/directory/test/test_principal.py (13574 => \
13575)</h4> <pre class="diff"><span>
<span class="info">--- \
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) </span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx">
</span><span class="cx"> from urllib import quote
</span><span class="cx"> from uuid import UUID
</span><ins>+import random
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class ProvisionedPrincipals(StoreTestCase):
</span><span class="lines">@@ -830,16 +831,16 @@
</span><span class="cx"> """
</span><span class="cx"> Default access controls for principals.
</span><span class="cx"> """
</span><ins>+ records = yield self._allRecords()
</ins><span class="cx"> for (
</span><span class="cx"> _ignore_provisioningResource, \
_ignore_recordType, recordResource, _ignore_record </span><del>- ) in (yield \
self._allRecords()):
- if True: # user.enabled:
- for args in (
- yield _authReadOnlyPrivileges(
- self, recordResource, recordResource.principalURL()
- )
- ):
- yield self._checkPrivileges(*args)
</del><ins>+ ) in records:
+ for args in (
+ yield _authReadOnlyPrivileges(
+ self, recordResource, recordResource.principalURL(), \
records=random.sample(records, 10) + )
+ ):
+ yield self._checkPrivileges(*args)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -1015,20 +1016,21 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>-def _authReadOnlyPrivileges(self, resource, url):
</del><ins>+def _authReadOnlyPrivileges(self, resource, url, records=None):
</ins><span class="cx"> items = []
</span><ins>+ if records is None:
+ records = yield self._allRecords()
</ins><span class="cx"> for (
</span><span class="cx"> _ignore_provisioningResource, _ignore_recordType, \
recordResource, _ignore_record </span><del>- ) 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
- ))
</del><ins>+ ) in records:
+ items.append((
+ davxml.HRef().fromString(recordResource.principalURL()),
+ davxml.Read(), True
+ ))
+ items.append((
+ davxml.HRef().fromString(recordResource.principalURL()),
+ davxml.Write(), False
+ ))
</ins><span class="cx"> items.append((
</span><span class="cx"> davxml.Unauthenticated(), davxml.Read(), False
</span><span class="cx"> ))
</span></span></pre>
</div>
</div>
</body>
</html>
_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic