<!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>[14439] CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav</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/14439">14439</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 17:19:55 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't expect lists</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcaldavdatastoreschedulingimiptesttest_outboundpy">CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py</a></li>
<li><a href="#CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcarddavdatastoretesttest_sqlpy">CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcommondatastoretesttest_sqlpy">CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy">CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py</a></li>
<li><a href="#CalendarServerbranchesuserswsanchezpsycopg2cffitxdavwhotesttest_delegatespy">CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcaldavdatastoreschedulingimiptesttest_outboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py (14438 => 14439)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -544,7 +544,7 @@
</span><span class="cx">
</span><span class="cx"> txn = self.store.newTransaction()
</span><span class="cx"> self.assertEquals(
</span><del>- (yield txn.imipLookupByToken(token1)),
</del><ins>+ map(list, (yield txn.imipLookupByToken(token1))),
</ins><span class="cx"> [["organizer", "attendee", "icaluid"]])
</span><span class="cx"> yield txn.commit()
</span><span class="cx">
</span><span class="lines">@@ -704,7 +704,7 @@
</span><span class="cx"> """
</span><span class="cx"> class StubElement(Element):
</span><span class="cx"> loader = StringFormatTemplateLoader(
</span><del>- lambda : StringIO(
</del><ins>+ lambda: StringIO(
</ins><span class="cx"> "<test><alpha>%(slot1)s</alpha>%(other)s</test>"
</span><span class="cx"> ),
</span><span class="cx"> "testRenderHere"
</span><span class="lines">@@ -716,8 +716,10 @@
</span><span class="cx"> other="world")
</span><span class="cx"> result = []
</span><span class="cx"> flattenString(None, StubElement()).addCallback(result.append)
</span><del>- self.assertEquals(result,
- ["<test><alpha>hello</alpha>world</test>"])
</del><ins>+ self.assertEquals(
+ list(result),
+ ["<test><alpha>hello</alpha>world</test>"]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_templateLoaderWithAttributes(self):
</span><span class="lines">@@ -728,7 +730,7 @@
</span><span class="cx"> """
</span><span class="cx"> class StubElement(Element):
</span><span class="cx"> loader = StringFormatTemplateLoader(
</span><del>- lambda : StringIO(
</del><ins>+ lambda: StringIO(
</ins><span class="cx"> '<test><alpha beta="before %(slot1)s after">inner</alpha>'
</span><span class="cx"> '%(other)s</test>'
</span><span class="cx"> ),
</span><span class="lines">@@ -741,9 +743,13 @@
</span><span class="cx"> other="world")
</span><span class="cx"> result = []
</span><span class="cx"> flattenString(None, StubElement()).addCallback(result.append)
</span><del>- self.assertEquals(result,
- ['<test><alpha beta="before hello after">'
- 'inner</alpha>world</test>'])
</del><ins>+ self.assertEquals(
+ result,
+ [
+ '<test><alpha beta="before hello after">'
+ 'inner</alpha>world</test>'
+ ]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def test_templateLoaderTagSoup(self):
</span><span class="lines">@@ -755,7 +761,7 @@
</span><span class="cx"> """
</span><span class="cx"> class StubElement(Element):
</span><span class="cx"> loader = StringFormatTemplateLoader(
</span><del>- lambda : StringIO(
</del><ins>+ lambda: StringIO(
</ins><span class="cx"> '<test><alpha beta="before %(slot1)s after">inner</alpha>'
</span><span class="cx"> '%(other)s'
</span><span class="cx"> ),
</span></span></pre></div>
<a id="CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcarddavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/carddav/datastore/test/test_sql.py (14438 => 14439)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx">
</span><span class="cx"> aboForeignMembers = schema.ABO_FOREIGN_MEMBERS
</span><span class="cx"> foreignMemberRows = yield Select([aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers).on(txn)
</span><del>- self.assertEqual(foreignMemberRows, [[groupObject._resourceID, "urn:uuid:uid3"]])
</del><ins>+ self.assertEqual(map(list, foreignMemberRows), [[groupObject._resourceID, "urn:uuid:uid3"]])
</ins><span class="cx">
</span><span class="cx"> subgroup = VCard.fromString(
</span><span class="cx"> """BEGIN:VCARD
</span><span class="lines">@@ -598,10 +598,13 @@
</span><span class="cx"> subgroupObject = yield adbk.createAddressBookObjectWithName("sg.vcf", subgroup)
</span><span class="cx">
</span><span class="cx"> memberRows = yield Select([aboMembers.GROUP_ID, aboMembers.MEMBER_ID], From=aboMembers, Where=aboMembers.REMOVED == False).on(txn)
</span><del>- self.assertEqual(sorted(memberRows), sorted([
- [groupObject._resourceID, subgroupObject._resourceID],
- [subgroupObject._resourceID, personObject._resourceID],
- ]))
</del><ins>+ self.assertEqual(
+ map(list, sorted(memberRows)),
+ sorted([
+ [groupObject._resourceID, subgroupObject._resourceID],
+ [subgroupObject._resourceID, personObject._resourceID],
+ ])
+ )
</ins><span class="cx">
</span><span class="cx"> foreignMemberRows = yield Select([aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers).on(txn)
</span><span class="cx"> self.assertEqual(foreignMemberRows, [])
</span><span class="lines">@@ -627,7 +630,10 @@
</span><span class="cx"> foreignMemberRows = yield Select(
</span><span class="cx"> [aboForeignMembers.GROUP_ID, aboForeignMembers.MEMBER_ADDRESS], From=aboForeignMembers,
</span><span class="cx"> ).on(txn)
</span><del>- self.assertEqual(foreignMemberRows, [[groupObject._resourceID, "urn:uuid:uid3"]])
</del><ins>+ self.assertEqual(
+ map(list, foreignMemberRows),
+ [[groupObject._resourceID, "urn:uuid:uid3"]]
+ )
</ins><span class="cx">
</span><span class="cx"> yield home.removeAddressBookWithName("addressbook")
</span><span class="cx"> yield txn.commit()
</span></span></pre></div>
<a id="CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/test/test_sql.py (14438 => 14439)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -92,8 +92,10 @@
</span><span class="cx"> self.patch(self.store, "logTransactionWaits", 1)
</span><span class="cx">
</span><span class="cx"> ctr = [0]
</span><ins>+
</ins><span class="cx"> def counter(*args, **kwargs):
</span><span class="cx"> ctr[0] += 1
</span><ins>+
</ins><span class="cx"> self.patch(log, "error", counter)
</span><span class="cx">
</span><span class="cx"> txn = self.transactionUnderTest()
</span><span class="lines">@@ -115,8 +117,10 @@
</span><span class="cx"> self.patch(self.store, "timeoutTransactions", 1)
</span><span class="cx">
</span><span class="cx"> ctr = [0]
</span><ins>+
</ins><span class="cx"> def counter(*args, **kwargs):
</span><span class="cx"> ctr[0] += 1
</span><ins>+
</ins><span class="cx"> self.patch(log, "error", counter)
</span><span class="cx">
</span><span class="cx"> txn = self.transactionUnderTest()
</span><span class="lines">@@ -130,7 +134,8 @@
</span><span class="cx">
</span><span class="cx"> def test_logWaitsAndTxnTimeout(self):
</span><span class="cx"> """
</span><del>- CommonStoreTransactionMonitor logs waiting transactions and terminates long transactions.
</del><ins>+ CommonStoreTransactionMonitor logs waiting transactions and terminates
+ long transactions.
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> c = Clock()
</span><span class="lines">@@ -141,11 +146,13 @@
</span><span class="cx"> self.patch(self.store, "timeoutTransactions", 2)
</span><span class="cx">
</span><span class="cx"> ctr = [0, 0]
</span><ins>+
</ins><span class="cx"> def counter(logStr, *args, **kwargs):
</span><span class="cx"> if "wait" in logStr:
</span><span class="cx"> ctr[0] += 1
</span><span class="cx"> elif "abort" in logStr:
</span><span class="cx"> ctr[1] += 1
</span><ins>+
</ins><span class="cx"> self.patch(log, "error", counter)
</span><span class="cx">
</span><span class="cx"> txn = self.transactionUnderTest()
</span><span class="lines">@@ -270,11 +277,13 @@
</span><span class="cx"> cs = schema.CALENDARSERVER
</span><span class="cx"> yield Select([cs.VALUE], From=cs).on(txn)
</span><span class="cx"> waitAMoment = Deferred()
</span><ins>+
</ins><span class="cx"> @inlineCallbacks
</span><span class="cx"> def later(subtxn):
</span><span class="cx"> yield waitAMoment
</span><span class="cx"> value = yield Select([cs.VALUE], From=cs).on(subtxn)
</span><span class="cx"> returnValue(value)
</span><ins>+
</ins><span class="cx"> started = txn.subtransaction(later)
</span><span class="cx"> txn.abort()
</span><span class="cx"> waitAMoment.callback(True)
</span><span class="lines">@@ -365,15 +374,23 @@
</span><span class="cx"> from txdav.common.datastore.sql import _normalizeColumnUUIDs
</span><span class="cx"> yield _normalizeColumnUUIDs(txn, rp.VIEWER_UID)
</span><span class="cx"> self.assertEqual(
</span><del>- (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"]]
</del><ins>+ 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"
+ ]
+ ]
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -399,7 +416,10 @@
</span><span class="cx"> yield t1.calendarHomeWithUID(denormalizedUID, create=True)
</span><span class="cx"> yield self.commit()
</span><span class="cx"> yield fixUUIDNormalization(self.storeUnderTest())
</span><del>- self.assertEqual((yield self.allHomeUIDs()), [[normalizedUID]])
</del><ins>+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs())),
+ [[normalizedUID]]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -413,8 +433,10 @@
</span><span class="cx"> yield t1.notificationsWithUID(denormalizedUID, create=True)
</span><span class="cx"> yield self.commit()
</span><span class="cx"> yield fixUUIDNormalization(self.storeUnderTest())
</span><del>- self.assertEqual((yield self.allHomeUIDs(schema.NOTIFICATION_HOME)),
- [[normalizedUID]])
</del><ins>+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs(schema.NOTIFICATION_HOME))),
+ [[normalizedUID]]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -428,8 +450,10 @@
</span><span class="cx"> yield t1.addressbookHomeWithUID(denormalizedUID, create=True)
</span><span class="cx"> yield self.commit()
</span><span class="cx"> yield fixUUIDNormalization(self.storeUnderTest())
</span><del>- self.assertEqual((yield self.allHomeUIDs(schema.ADDRESSBOOK_HOME)),
- [[normalizedUID]])
</del><ins>+ self.assertEqual(
+ map(list, (yield self.allHomeUIDs(schema.ADDRESSBOOK_HOME))),
+ [[normalizedUID]]
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="CalendarServerbranchesuserswsanchezpsycopg2cffitxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py (14438 => 14439)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> self.assertEqual(len(schedules), 1)
</span><span class="cx"> self.assertEqual(len(replies), 1)
</span><span class="cx">
</span><del>- self.assertEqual(replies[0], [1, 1, None, cal1, ])
</del><ins>+ self.assertEqual(list(replies[0]), [1, 1, None, cal1, ])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -271,4 +271,4 @@
</span><span class="cx"> self.assertEqual(len(schedules), 1)
</span><span class="cx"> self.assertEqual(len(replies), 1)
</span><span class="cx">
</span><del>- self.assertEqual(replies[0], [1, 1, 3, None, ])
</del><ins>+ self.assertEqual(list(replies[0]), [1, 1, 3, None, ])
</ins></span></pre></div>
<a id="CalendarServerbranchesuserswsanchezpsycopg2cffitxdavwhotesttest_delegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/wsanchez/psycopg2cffi/txdav/who/test/test_delegates.py (14438 => 14439)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> yield txn.commit()
</span><del>- self.assertEquals([["__sagen1__"]], results)
</del><ins>+ self.assertEquals([["__sagen1__"]], map(list, results))
</ins><span class="cx">
</span><span class="cx"> # Delegate groups:
</span><span class="cx"> group1 = yield self.directory.recordWithUID(u"__top_group_1__")
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> yield txn.commit()
</span><del>- self.assertEquals([["__top_group_1__"]], results)
</del><ins>+ self.assertEquals([["__top_group_1__"]], map(list, results))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>