<!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>[14785] CalendarServer/trunk</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/14785">14785</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-05-14 08:45:58 -0700 (Thu, 14 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Random hash seed test fix.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcontribperformanceloadtesticalpy">CalendarServer/trunk/contrib/performance/loadtest/ical.py</a></li>
<li><a href="#CalendarServertrunkcontribperformanceloadtesttest_icalpy">CalendarServer/trunk/contrib/performance/loadtest/test_ical.py</a></li>
<li><a href="#CalendarServertrunkrequirementsstabletxt">CalendarServer/trunk/requirements-stable.txt</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdatafiltersperuserdatapy">CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py</a></li>
<li><a href="#CalendarServertrunktxdavdpstesttest_jsonpy">CalendarServer/trunk/txdav/dps/test/test_json.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_groupspy">CalendarServer/trunk/txdav/who/test/test_groups.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_httppy">CalendarServer/trunk/txweb2/test/test_http.py</a></li>
<li><a href="#CalendarServertrunktxweb2testtest_serverpy">CalendarServer/trunk/txweb2/test/test_server.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcontribperformanceloadtesticalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/contrib/performance/loadtest/ical.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -973,6 +973,7 @@
</span><span class="cx"> local cache.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ changed.sort()
</ins><span class="cx"> while changed:
</span><span class="cx"> batchedHrefs = changed[:self.MULTIGET_BATCH_SIZE]
</span><span class="cx"> changed = changed[self.MULTIGET_BATCH_SIZE:]
</span></span></pre></div>
<a id="CalendarServertrunkcontribperformanceloadtesttest_icalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/contrib/performance/loadtest/test_ical.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> from twistedcaldav.ical import Component
</span><span class="cx"> from twistedcaldav.timezones import TimezoneCache
</span><span class="cx">
</span><ins>+import json
</ins><span class="cx"> import os
</span><span class="cx">
</span><span class="cx"> EVENT_UID = 'D94F247D-7433-43AF-B84B-ADD684D023B0'
</span><span class="lines">@@ -1537,7 +1538,9 @@
</span><span class="cx"> self.client.serialize()
</span><span class="cx"> self.assertTrue(os.path.exists(clientPath))
</span><span class="cx"> self.assertTrue(os.path.exists(indexPath))
</span><del>- self.assertEqual(open(indexPath).read().replace(" \n", "\n"), """{
</del><ins>+ def _normDict(d):
+ return dict([(k, sorted(v, key=lambda x: x["changeToken" if k == "calendars" else "url"]) if v else None,) for k, v in d.items()])
+ self.assertEqual(_normDict(json.loads(open(indexPath).read())), _normDict(json.loads("""{
</ins><span class="cx"> "calendars": [
</span><span class="cx"> {
</span><span class="cx"> "changeToken": "123",
</span><span class="lines">@@ -1590,7 +1593,7 @@
</span><span class="cx"> "uid": "00a79cad-857b-418e-a54a-340b5686d747"
</span><span class="cx"> }
</span><span class="cx"> ]
</span><del>-}""")
</del><ins>+}""")))
</ins><span class="cx">
</span><span class="cx"> event1Path = os.path.join(clientPath, "calendar", "1.ics")
</span><span class="cx"> self.assertTrue(os.path.exists(event1Path))
</span></span></pre></div>
<a id="CalendarServertrunkrequirementsstabletxt"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/requirements-stable.txt (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/requirements-stable.txt 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/requirements-stable.txt 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> #pyOpenSSL
</span><span class="cx"> pycrypto==2.6.1
</span><span class="cx">
</span><del>- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14782#egg=twextpy
</del><ins>+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14784#egg=twextpy
</ins><span class="cx"> cffi==0.8.6
</span><span class="cx"> pycparser==2.10
</span><span class="cx"> #twisted
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdatafiltersperuserdatapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -295,7 +295,7 @@
</span><span class="cx"> if master_perinstance:
</span><span class="cx"> peruser_component.addComponent(master_perinstance)
</span><span class="cx"> peruser_component_different = True
</span><del>- for rid, perinstance in perinstance_components.iteritems():
</del><ins>+ for rid, perinstance in sorted(perinstance_components.iteritems(), key=lambda x: x[0]):
</ins><span class="cx"> if rid is None:
</span><span class="cx"> continue
</span><span class="cx"> if master_perinstance is None or perinstance != master_perinstance:
</span></span></pre></div>
<a id="CalendarServertrunktxdavdpstesttest_jsonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_json.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_json.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/txdav/dps/test/test_json.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> from twext.who.test.test_xml import xmlService
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><ins>+import json
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class SerializationTests(unittest.TestCase):
</span><span class="lines">@@ -212,19 +213,15 @@
</span><span class="cx"> expression = MatchExpression(FieldName.uid, uid)
</span><span class="cx"> jsonText = expressionAsJSONText(expression)
</span><span class="cx">
</span><del>- expected = (
- u"""
- {{
- "field": "uid",
- "flags": "{{}}",
- "match": "equals",
- "value": "{uid}",
- "type": "MatchExpression"
- }}
- """
- ).replace(" ", "").replace("\n", "").format(uid=uid)
</del><ins>+ expected = {
+ "type": "MatchExpression",
+ "field": "uid",
+ "value": uid,
+ "match": "equals",
+ "flags": "{}",
+ }
</ins><span class="cx">
</span><del>- self.assertEquals(jsonText, expected)
</del><ins>+ self.assertEquals(json.loads(jsonText), expected)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhotesttest_groupspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_groups.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_groups.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/txdav/who/test/test_groups.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -412,48 +412,48 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- (
</del><ins>+ map(set, (
</ins><span class="cx"> # changed
</span><span class="cx"> [("A", ("1", "2")), ("B", ("3", "4"))],
</span><span class="cx"> # removed
</span><span class="cx"> [],
</span><del>- ),
- diffAssignments(
</del><ins>+ )),
+ map(set, diffAssignments(
</ins><span class="cx"> # old
</span><span class="cx"> {},
</span><span class="cx"> # new
</span><span class="cx"> {"A": ("1", "2"), "B": ("3", "4")}
</span><del>- )
</del><ins>+ ))
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- (
</del><ins>+ map(set, (
</ins><span class="cx"> # changed
</span><span class="cx"> [],
</span><span class="cx"> # removed
</span><span class="cx"> ["A", "B"],
</span><del>- ),
- diffAssignments(
</del><ins>+ )),
+ map(set, diffAssignments(
</ins><span class="cx"> # old
</span><span class="cx"> {"A": ("1", "2"), "B": ("3", "4")},
</span><span class="cx"> # new
</span><span class="cx"> {},
</span><del>- )
</del><ins>+ ))
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> self.assertEquals(
</span><del>- (
</del><ins>+ map(set, (
</ins><span class="cx"> # changed
</span><span class="cx"> [('C', ('4', '5')), ('D', ('7', '8'))],
</span><span class="cx"> # removed
</span><span class="cx"> ["B"],
</span><del>- ),
- diffAssignments(
</del><ins>+ )),
+ map(set, diffAssignments(
</ins><span class="cx"> # old
</span><span class="cx"> {"A": ("1", "2"), "B": ("3", "4"), "C": ("5", "6")},
</span><span class="cx"> # new
</span><span class="cx"> {"D": ("7", "8"), "C": ("4", "5"), "A": ("1", "2")},
</span><del>- )
</del><ins>+ ))
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -580,11 +580,11 @@
</span><span class="cx"> yield self.groupCacher.refreshGroup(self.transactionUnderTest(), "__top_group_1__")
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- self.assertEqual(TestNotifier.changedTokens, [
</del><ins>+ self.assertEqual(set(TestNotifier.changedTokens), set([
</ins><span class="cx"> "__top_group_1__",
</span><span class="cx"> "__sagen1__",
</span><span class="cx"> "__cdaboo1__",
</span><del>- ])
</del><ins>+ ]))
</ins><span class="cx"> TestNotifier.changedTokens = []
</span><span class="cx">
</span><span class="cx"> # Add sub-group member to group
</span><span class="lines">@@ -595,11 +595,11 @@
</span><span class="cx"> yield self.groupCacher.refreshGroup(self.transactionUnderTest(), "__top_group_1__")
</span><span class="cx"> yield self.commit()
</span><span class="cx">
</span><del>- self.assertEqual(TestNotifier.changedTokens, [
</del><ins>+ self.assertEqual(set(TestNotifier.changedTokens), set([
</ins><span class="cx"> "__top_group_1__",
</span><span class="cx"> "__sagen1__",
</span><span class="cx"> "__cdaboo1__",
</span><del>- ])
</del><ins>+ ]))
</ins><span class="cx"> TestNotifier.changedTokens = []
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_httppy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_http.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/test/test_http.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/txweb2/test/test_http.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx"> else:
</span><span class="cx"> sortedHeaderCommands.append(cmd)
</span><span class="cx"> self.assertEquals(receivedRequest.cmds, sortedHeaderCommands)
</span><del>- self.assertEquals(cxn.client.data, data)
</del><ins>+ self.assertEquals(set(cxn.client.data.splitlines()), set(data.splitlines()))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def assertDone(self, cxn, done=True):
</span></span></pre></div>
<a id="CalendarServertrunktxweb2testtest_serverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txweb2/test/test_server.py (14784 => 14785)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txweb2/test/test_server.py 2015-05-14 15:44:22 UTC (rev 14784)
+++ CalendarServer/trunk/txweb2/test/test_server.py 2015-05-14 15:45:58 UTC (rev 14785)
</span><span class="lines">@@ -301,7 +301,9 @@
</span><span class="cx"> if expected_data is not None:
</span><span class="cx"> self.assertEquals(data, expected_data)
</span><span class="cx"> for key, value in expected_headers.iteritems():
</span><del>- self.assertEquals(headers.getHeader(key), value)
</del><ins>+ test1 = sorted(headers.getHeader(key))
+ test2 = sorted(value)
+ self.assertEquals(test1, test2)
</ins><span class="cx"> self.assertEquals(failed, expectedfailure)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>