[CalendarServer-changes] [14785] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Thu May 14 08:45:58 PDT 2015
Revision: 14785
http://trac.calendarserver.org//changeset/14785
Author: cdaboo at apple.com
Date: 2015-05-14 08:45:58 -0700 (Thu, 14 May 2015)
Log Message:
-----------
Random hash seed test fix.
Modified Paths:
--------------
CalendarServer/trunk/contrib/performance/loadtest/ical.py
CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
CalendarServer/trunk/requirements-stable.txt
CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py
CalendarServer/trunk/txdav/dps/test/test_json.py
CalendarServer/trunk/txdav/who/test/test_groups.py
CalendarServer/trunk/txweb2/test/test_http.py
CalendarServer/trunk/txweb2/test/test_server.py
Modified: CalendarServer/trunk/contrib/performance/loadtest/ical.py
===================================================================
--- 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)
@@ -973,6 +973,7 @@
local cache.
"""
+ changed.sort()
while changed:
batchedHrefs = changed[:self.MULTIGET_BATCH_SIZE]
changed = changed[self.MULTIGET_BATCH_SIZE:]
Modified: CalendarServer/trunk/contrib/performance/loadtest/test_ical.py
===================================================================
--- 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)
@@ -38,6 +38,7 @@
from twistedcaldav.ical import Component
from twistedcaldav.timezones import TimezoneCache
+import json
import os
EVENT_UID = 'D94F247D-7433-43AF-B84B-ADD684D023B0'
@@ -1537,7 +1538,9 @@
self.client.serialize()
self.assertTrue(os.path.exists(clientPath))
self.assertTrue(os.path.exists(indexPath))
- self.assertEqual(open(indexPath).read().replace(" \n", "\n"), """{
+ 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("""{
"calendars": [
{
"changeToken": "123",
@@ -1590,7 +1593,7 @@
"uid": "00a79cad-857b-418e-a54a-340b5686d747"
}
]
-}""")
+}""")))
event1Path = os.path.join(clientPath, "calendar", "1.ics")
self.assertTrue(os.path.exists(event1Path))
Modified: CalendarServer/trunk/requirements-stable.txt
===================================================================
--- 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)
@@ -36,7 +36,7 @@
#pyOpenSSL
pycrypto==2.6.1
- --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14782#egg=twextpy
+ --editable svn+http://svn.calendarserver.org/repository/calendarserver/twext/trunk@14784#egg=twextpy
cffi==0.8.6
pycparser==2.10
#twisted
Modified: CalendarServer/trunk/twistedcaldav/datafilters/peruserdata.py
===================================================================
--- 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)
@@ -295,7 +295,7 @@
if master_perinstance:
peruser_component.addComponent(master_perinstance)
peruser_component_different = True
- for rid, perinstance in perinstance_components.iteritems():
+ for rid, perinstance in sorted(perinstance_components.iteritems(), key=lambda x: x[0]):
if rid is None:
continue
if master_perinstance is None or perinstance != master_perinstance:
Modified: CalendarServer/trunk/txdav/dps/test/test_json.py
===================================================================
--- 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)
@@ -33,6 +33,7 @@
from twext.who.test.test_xml import xmlService
from twisted.trial import unittest
+import json
class SerializationTests(unittest.TestCase):
@@ -212,19 +213,15 @@
expression = MatchExpression(FieldName.uid, uid)
jsonText = expressionAsJSONText(expression)
- expected = (
- u"""
- {{
- "field": "uid",
- "flags": "{{}}",
- "match": "equals",
- "value": "{uid}",
- "type": "MatchExpression"
- }}
- """
- ).replace(" ", "").replace("\n", "").format(uid=uid)
+ expected = {
+ "type": "MatchExpression",
+ "field": "uid",
+ "value": uid,
+ "match": "equals",
+ "flags": "{}",
+ }
- self.assertEquals(jsonText, expected)
+ self.assertEquals(json.loads(jsonText), expected)
Modified: CalendarServer/trunk/txdav/who/test/test_groups.py
===================================================================
--- 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)
@@ -412,48 +412,48 @@
)
self.assertEquals(
- (
+ map(set, (
# changed
[("A", ("1", "2")), ("B", ("3", "4"))],
# removed
[],
- ),
- diffAssignments(
+ )),
+ map(set, diffAssignments(
# old
{},
# new
{"A": ("1", "2"), "B": ("3", "4")}
- )
+ ))
)
self.assertEquals(
- (
+ map(set, (
# changed
[],
# removed
["A", "B"],
- ),
- diffAssignments(
+ )),
+ map(set, diffAssignments(
# old
{"A": ("1", "2"), "B": ("3", "4")},
# new
{},
- )
+ ))
)
self.assertEquals(
- (
+ map(set, (
# changed
[('C', ('4', '5')), ('D', ('7', '8'))],
# removed
["B"],
- ),
- diffAssignments(
+ )),
+ map(set, diffAssignments(
# old
{"A": ("1", "2"), "B": ("3", "4"), "C": ("5", "6")},
# new
{"D": ("7", "8"), "C": ("4", "5"), "A": ("1", "2")},
- )
+ ))
)
@@ -580,11 +580,11 @@
yield self.groupCacher.refreshGroup(self.transactionUnderTest(), "__top_group_1__")
yield self.commit()
- self.assertEqual(TestNotifier.changedTokens, [
+ self.assertEqual(set(TestNotifier.changedTokens), set([
"__top_group_1__",
"__sagen1__",
"__cdaboo1__",
- ])
+ ]))
TestNotifier.changedTokens = []
# Add sub-group member to group
@@ -595,11 +595,11 @@
yield self.groupCacher.refreshGroup(self.transactionUnderTest(), "__top_group_1__")
yield self.commit()
- self.assertEqual(TestNotifier.changedTokens, [
+ self.assertEqual(set(TestNotifier.changedTokens), set([
"__top_group_1__",
"__sagen1__",
"__cdaboo1__",
- ])
+ ]))
TestNotifier.changedTokens = []
Modified: CalendarServer/trunk/txweb2/test/test_http.py
===================================================================
--- 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)
@@ -505,7 +505,7 @@
else:
sortedHeaderCommands.append(cmd)
self.assertEquals(receivedRequest.cmds, sortedHeaderCommands)
- self.assertEquals(cxn.client.data, data)
+ self.assertEquals(set(cxn.client.data.splitlines()), set(data.splitlines()))
def assertDone(self, cxn, done=True):
Modified: CalendarServer/trunk/txweb2/test/test_server.py
===================================================================
--- 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)
@@ -301,7 +301,9 @@
if expected_data is not None:
self.assertEquals(data, expected_data)
for key, value in expected_headers.iteritems():
- self.assertEquals(headers.getHeader(key), value)
+ test1 = sorted(headers.getHeader(key))
+ test2 = sorted(value)
+ self.assertEquals(test1, test2)
self.assertEquals(failed, expectedfailure)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150514/3a7f9124/attachment-0001.html>
More information about the calendarserver-changes
mailing list