[CalendarServer-changes] [14439] CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav
source_changes at macosforge.org
source_changes at macosforge.org
Wed Feb 18 17:19:55 PST 2015
Revision: 14439
http://trac.calendarserver.org//changeset/14439
Author: wsanchez at apple.com
Date: 2015-02-18 17:19:55 -0800 (Wed, 18 Feb 2015)
Log Message:
-----------
Don't expect lists
Modified Paths:
--------------
CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py
CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py
CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py
CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py
CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py
Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py
===================================================================
--- CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-02-19 00:50:19 UTC (rev 14438)
+++ CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-02-19 01:19:55 UTC (rev 14439)
@@ -544,7 +544,7 @@
txn = self.store.newTransaction()
self.assertEquals(
- (yield txn.imipLookupByToken(token1)),
+ map(list, (yield txn.imipLookupByToken(token1))),
[["organizer", "attendee", "icaluid"]])
yield txn.commit()
@@ -704,7 +704,7 @@
"""
class StubElement(Element):
loader = StringFormatTemplateLoader(
- lambda : StringIO(
+ lambda: StringIO(
"<test><alpha>%(slot1)s</alpha>%(other)s</test>"
),
"testRenderHere"
@@ -716,8 +716,10 @@
other="world")
result = []
flattenString(None, StubElement()).addCallback(result.append)
- self.assertEquals(result,
- ["<test><alpha>hello</alpha>world</test>"])
+ self.assertEquals(
+ list(result),
+ ["<test><alpha>hello</alpha>world</test>"]
+ )
def test_templateLoaderWithAttributes(self):
@@ -728,7 +730,7 @@
"""
class StubElement(Element):
loader = StringFormatTemplateLoader(
- lambda : StringIO(
+ lambda: StringIO(
'<test><alpha beta="before %(slot1)s after">inner</alpha>'
'%(other)s</test>'
),
@@ -741,9 +743,13 @@
other="world")
result = []
flattenString(None, StubElement()).addCallback(result.append)
- self.assertEquals(result,
- ['<test><alpha beta="before hello after">'
- 'inner</alpha>world</test>'])
+ self.assertEquals(
+ result,
+ [
+ '<test><alpha beta="before hello after">'
+ 'inner</alpha>world</test>'
+ ]
+ )
def test_templateLoaderTagSoup(self):
@@ -755,7 +761,7 @@
"""
class StubElement(Element):
loader = StringFormatTemplateLoader(
- lambda : StringIO(
+ lambda: StringIO(
'<test><alpha beta="before %(slot1)s after">inner</alpha>'
'%(other)s'
),
Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py 2015-02-19 00:50:19 UTC (rev 14438)
+++ CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py 2015-02-19 01:19:55 UTC (rev 14439)
@@ -580,7 +580,7 @@
aboForeignMembers = schema.ABO_FOREIGN_MEMBERS
foreignMemberRows = yield Select([aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers).on(txn)
- self.assertEqual(foreignMemberRows, [[groupObject._resourceID, "urn:uuid:uid3"]])
+ self.assertEqual(map(list, foreignMemberRows), [[groupObject._resourceID, "urn:uuid:uid3"]])
subgroup = VCard.fromString(
"""BEGIN:VCARD
@@ -598,10 +598,13 @@
subgroupObject = yield adbk.createAddressBookObjectWithName("sg.vcf", subgroup)
memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID], From=aboMembers, Where=aboMembers.REMOVED == False).on(txn)
- self.assertEqual(sorted(memberRows), sorted([
- [groupObject._resourceID, subgroupObject._resourceID],
- [subgroupObject._resourceID, personObject._resourceID],
- ]))
+ self.assertEqual(
+ map(list, sorted(memberRows)),
+ sorted([
+ [groupObject._resourceID, subgroupObject._resourceID],
+ [subgroupObject._resourceID, personObject._resourceID],
+ ])
+ )
foreignMemberRows = yield Select([aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers).on(txn)
self.assertEqual(foreignMemberRows, [])
@@ -627,7 +630,10 @@
foreignMemberRows = yield Select(
[aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers,
).on(txn)
- self.assertEqual(foreignMemberRows, [[groupObject._resourceID, "urn:uuid:uid3"]])
+ self.assertEqual(
+ map(list, foreignMemberRows),
+ [[groupObject._resourceID, "urn:uuid:uid3"]]
+ )
yield home.removeAddressBookWithName("addressbook")
yield txn.commit()
Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py
===================================================================
--- CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py 2015-02-19 00:50:19 UTC (rev 14438)
+++ CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py 2015-02-19 01:19:55 UTC (rev 14439)
@@ -92,8 +92,10 @@
self.patch(self.store, "logTransactionWaits", 1)
ctr = [0]
+
def counter(*args, **kwargs):
ctr[0] += 1
+
self.patch(log, "error", counter)
txn = self.transactionUnderTest()
@@ -115,8 +117,10 @@
self.patch(self.store, "timeoutTransactions", 1)
ctr = [0]
+
def counter(*args, **kwargs):
ctr[0] += 1
+
self.patch(log, "error", counter)
txn = self.transactionUnderTest()
@@ -130,7 +134,8 @@
def test_logWaitsAndTxnTimeout(self):
"""
- CommonStoreTransactionMonitor logs waiting transactions and terminates long transactions.
+ CommonStoreTransactionMonitor logs waiting transactions and terminates
+ long transactions.
"""
c = Clock()
@@ -141,11 +146,13 @@
self.patch(self.store, "timeoutTransactions", 2)
ctr = [0, 0]
+
def counter(logStr, *args, **kwargs):
if "wait" in logStr:
ctr[0] += 1
elif "abort" in logStr:
ctr[1] += 1
+
self.patch(log, "error", counter)
txn = self.transactionUnderTest()
@@ -270,11 +277,13 @@
cs = schema.CALENDARSERVER
yield Select([cs.VALUE], From=cs).on(txn)
waitAMoment = Deferred()
+
@inlineCallbacks
def later(subtxn):
yield waitAMoment
value = yield Select([cs.VALUE], From=cs).on(subtxn)
returnValue(value)
+
started = txn.subtransaction(later)
txn.abort()
waitAMoment.callback(True)
@@ -365,15 +374,23 @@
from txdav.common.datastore.sql import _normalizeColumnUUIDs
yield _normalizeColumnUUIDs(txn, rp.VIEWER_UID)
self.assertEqual(
- (yield Select(
- [rp.RESOURCE_ID, rp.NAME,
- rp.VALUE, rp.VIEWER_UID],
- From=rp,
- OrderBy=rp.RESOURCE_ID, Ascending=True,
- ).on(txn)),
- [[1, "asdf", "property-value", "not-a-uuid"],
- [2, "fdsa", "another-value",
- "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA"]]
+ map(
+ list,
+ (
+ yield Select(
+ [rp.RESOURCE_ID, rp.NAME, rp.VALUE, rp.VIEWER_UID],
+ From=rp,
+ OrderBy=rp.RESOURCE_ID, Ascending=True,
+ ).on(txn)
+ )
+ ),
+ [
+ [1, "asdf", "property-value", "not-a-uuid"],
+ [
+ 2, "fdsa",
+ "another-value", "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA"
+ ]
+ ]
)
@@ -399,7 +416,10 @@
yield t1.calendarHomeWithUID(denormalizedUID, create=True)
yield self.commit()
yield fixUUIDNormalization(self.storeUnderTest())
- self.assertEqual((yield self.allHomeUIDs()), [[normalizedUID]])
+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs())),
+ [[normalizedUID]]
+ )
@inlineCallbacks
@@ -413,8 +433,10 @@
yield t1.notificationsWithUID(denormalizedUID, create=True)
yield self.commit()
yield fixUUIDNormalization(self.storeUnderTest())
- self.assertEqual((yield self.allHomeUIDs(schema.NOTIFICATION_HOME)),
- [[normalizedUID]])
+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs(schema.NOTIFICATION_HOME))),
+ [[normalizedUID]]
+ )
@inlineCallbacks
@@ -428,8 +450,10 @@
yield t1.addressbookHomeWithUID(denormalizedUID, create=True)
yield self.commit()
yield fixUUIDNormalization(self.storeUnderTest())
- self.assertEqual((yield self.allHomeUIDs(schema.ADDRESSBOOK_HOME)),
- [[normalizedUID]])
+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs(schema.ADDRESSBOOK_HOME))),
+ [[normalizedUID]]
+ )
@inlineCallbacks
Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py
===================================================================
--- CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-02-19 00:50:19 UTC (rev 14438)
+++ CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-02-19 01:19:55 UTC (rev 14439)
@@ -175,7 +175,7 @@
self.assertEqual(len(schedules), 1)
self.assertEqual(len(replies), 1)
- self.assertEqual(replies[0], [1, 1, None, cal1, ])
+ self.assertEqual(list(replies[0]), [1, 1, None, cal1, ])
@inlineCallbacks
@@ -271,4 +271,4 @@
self.assertEqual(len(schedules), 1)
self.assertEqual(len(replies), 1)
- self.assertEqual(replies[0], [1, 1, 3, None, ])
+ self.assertEqual(list(replies[0]), [1, 1, 3, None, ])
Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py
===================================================================
--- CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py 2015-02-19 00:50:19 UTC (rev 14438)
+++ CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py 2015-02-19 01:19:55 UTC (rev 14439)
@@ -269,7 +269,7 @@
)
)
yield txn.commit()
- self.assertEquals([["__sagen1__"]], results)
+ self.assertEquals([["__sagen1__"]], map(list, results))
# Delegate groups:
group1 = yield self.directory.recordWithUID(u"__top_group_1__")
@@ -291,7 +291,7 @@
)
)
yield txn.commit()
- self.assertEquals([["__top_group_1__"]], results)
+ self.assertEquals([["__top_group_1__"]], map(list, results))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150218/9a5e3dcb/attachment-0001.html>
More information about the calendarserver-changes
mailing list