<!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>[14440] 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/14440">14440</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-18 18:16:17 -0800 (Wed, 18 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge bits of branches/users/wsanchez/psycopg2cffi that deal with not expecting list results in tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavbasedatastoretesttest_subpostgrespy">CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_outboundpy">CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py</a></li>
<li><a href="#CalendarServertrunktxdavcarddavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretesttest_sqlpy">CalendarServer/trunk/txdav/common/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy">CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py</a></li>
<li><a href="#CalendarServertrunktxdavwhotesttest_delegatespy">CalendarServer/trunk/txdav/who/test/test_delegates.py</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#CalendarServertrunk">CalendarServer/trunk/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunk"></a>
<div class="propset"><h4>Property changes: CalendarServer/trunk</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><span class="cx"> + /CalDAVTester/trunk:11193-11198
</span><span class="cx">/CalendarServer/branches/config-separation:4379-4443
</span><span class="cx">/CalendarServer/branches/egg-info-351:4589-4625
</span><span class="cx">/CalendarServer/branches/generic-sqlstore:6167-6191
</span><span class="cx">/CalendarServer/branches/new-store:5594-5934
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile:5911-5935
</span><span class="cx">/CalendarServer/branches/new-store-no-caldavfile-2:5936-5981
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-4.3-dev:10180-10190,10192
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.1-dev:11846
</span><span class="cx">/CalendarServer/branches/release/CalendarServer-5.2-dev:11972,12357-12358,12794,12814
</span><span class="cx">/CalendarServer/branches/users/cdaboo/batchupload-6699:6700-7198
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692:5693-5702
</span><span class="cx">/CalendarServer/branches/users/cdaboo/component-set-fixes:8130-8346
</span><span class="cx">/CalendarServer/branches/users/cdaboo/cross-pod-sharing:12038-12191
</span><span class="cx">/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627:3628-3644
</span><span class="cx">/CalendarServer/branches/users/cdaboo/fix-no-ischedule:11607-11871
</span><span class="cx">/CalendarServer/branches/users/cdaboo/implicituidrace:8137-8141
</span><span class="cx">/CalendarServer/branches/users/cdaboo/ischedule-dkim:9747-9979
</span><span class="cx">/CalendarServer/branches/users/cdaboo/json:11622-11912
</span><span class="cx">/CalendarServer/branches/users/cdaboo/managed-attachments:9985-10145
</span><span class="cx">/CalendarServer/branches/users/cdaboo/more-sharing-5591:5592-5601
</span><span class="cx">/CalendarServer/branches/users/cdaboo/partition-4464:4465-4957
</span><span class="cx">/CalendarServer/branches/users/cdaboo/performance-tweaks:11824-11836
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pods:7297-7377
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycalendar:7085-7206
</span><span class="cx">/CalendarServer/branches/users/cdaboo/pycard:7227-7237
</span><span class="cx">/CalendarServer/branches/users/cdaboo/queued-attendee-refreshes:7740-8287
</span><span class="cx">/CalendarServer/branches/users/cdaboo/relative-config-paths-5070:5071-5105
</span><span class="cx">/CalendarServer/branches/users/cdaboo/reverse-proxy-pods:11875-11900
</span><span class="cx">/CalendarServer/branches/users/cdaboo/scheduling-queue-refresh:11783-12557
</span><span class="cx">/CalendarServer/branches/users/cdaboo/shared-calendars-5187:5188-5440
</span><span class="cx">/CalendarServer/branches/users/cdaboo/sharing-in-the-store:11935-12016
</span><span class="cx">/CalendarServer/branches/users/cdaboo/store-scheduling:10876-11129
</span><span class="cx">/CalendarServer/branches/users/cdaboo/timezones:7443-7699
</span><span class="cx">/CalendarServer/branches/users/cdaboo/txn-debugging:8730-8743
</span><span class="cx">/CalendarServer/branches/users/gaya/cleanrevisions:12152-12334
</span><span class="cx">/CalendarServer/branches/users/gaya/groupsharee2:13669-13773
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroupfixes:12120-12142
</span><span class="cx">/CalendarServer/branches/users/gaya/sharedgroups-3:11088-11204
</span><span class="cx">/CalendarServer/branches/users/glyph/always-abort-txn-on-error:9958-9969
</span><span class="cx">/CalendarServer/branches/users/glyph/case-insensitive-uid:8772-8805
</span><span class="cx">/CalendarServer/branches/users/glyph/conn-limit:6574-6577
</span><span class="cx">/CalendarServer/branches/users/glyph/contacts-server-merge:4971-5080
</span><span class="cx">/CalendarServer/branches/users/glyph/dalify:6932-7023
</span><span class="cx">/CalendarServer/branches/users/glyph/db-reconnect:6824-6876
</span><span class="cx">/CalendarServer/branches/users/glyph/deploybuild:7563-7572
</span><span class="cx">/CalendarServer/branches/users/glyph/digest-auth-redux:10624-10635
</span><span class="cx">/CalendarServer/branches/users/glyph/disable-quota:7718-7727
</span><span class="cx">/CalendarServer/branches/users/glyph/dont-start-postgres:6592-6614
</span><span class="cx">/CalendarServer/branches/users/glyph/enforce-max-requests:11640-11643
</span><span class="cx">/CalendarServer/branches/users/glyph/hang-fix:11465-11491
</span><span class="cx">/CalendarServer/branches/users/glyph/imip-and-admin-html:7866-7984
</span><span class="cx">/CalendarServer/branches/users/glyph/ipv6-client:9054-9105
</span><span class="cx">/CalendarServer/branches/users/glyph/launchd-wrapper-bis:11413-11436
</span><span class="cx">/CalendarServer/branches/users/glyph/linux-tests:6893-6900
</span><span class="cx">/CalendarServer/branches/users/glyph/log-cleanups:11691-11731
</span><span class="cx">/CalendarServer/branches/users/glyph/migrate-merge:8690-8713
</span><span class="cx">/CalendarServer/branches/users/glyph/misc-portability-fixes:7365-7374
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-6:6322-6368
</span><span class="cx">/CalendarServer/branches/users/glyph/more-deferreds-7:6369-6445
</span><span class="cx">/CalendarServer/branches/users/glyph/multiget-delete:8321-8330
</span><span class="cx">/CalendarServer/branches/users/glyph/new-export:7444-7485
</span><span class="cx">/CalendarServer/branches/users/glyph/one-home-list-api:10048-10073
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle:7106-7155
</span><span class="cx">/CalendarServer/branches/users/glyph/oracle-nulls:7340-7351
</span><span class="cx">/CalendarServer/branches/users/glyph/other-html:8062-8091
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-sim:8240-8251
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade:8376-8400
</span><span class="cx">/CalendarServer/branches/users/glyph/parallel-upgrade_to_1:8571-8583
</span><span class="cx">/CalendarServer/branches/users/glyph/q:9560-9688
</span><span class="cx">/CalendarServer/branches/users/glyph/queue-locking-and-timing:10204-10289
</span><span class="cx">/CalendarServer/branches/users/glyph/quota:7604-7637
</span><span class="cx">/CalendarServer/branches/users/glyph/sendfdport:5388-5424
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-fixes:8436-8443
</span><span class="cx">/CalendarServer/branches/users/glyph/shared-pool-take2:8155-8174
</span><span class="cx">/CalendarServer/branches/users/glyph/sharedpool:6490-6550
</span><span class="cx">/CalendarServer/branches/users/glyph/sharing-api:9192-9205
</span><span class="cx">/CalendarServer/branches/users/glyph/skip-lonely-vtimezones:8524-8535
</span><span class="cx">/CalendarServer/branches/users/glyph/sql-store:5929-6073
</span><span class="cx">/CalendarServer/branches/users/glyph/start-service-start-loop:11060-11065
</span><span class="cx">/CalendarServer/branches/users/glyph/subtransactions:7248-7258
</span><span class="cx">/CalendarServer/branches/users/glyph/table-alias:8651-8664
</span><span class="cx">/CalendarServer/branches/users/glyph/uidexport:7673-7676
</span><span class="cx">/CalendarServer/branches/users/glyph/unshare-when-access-revoked:10562-10595
</span><span class="cx">/CalendarServer/branches/users/glyph/use-system-twisted:5084-5149
</span><span class="cx">/CalendarServer/branches/users/glyph/uuid-normalize:9268-9296
</span><span class="cx">/CalendarServer/branches/users/glyph/warning-cleanups:11347-11357
</span><span class="cx">/CalendarServer/branches/users/glyph/whenNotProposed:11881-11897
</span><span class="cx">/CalendarServer/branches/users/glyph/xattrs-from-files:7757-7769
</span><span class="cx">/CalendarServer/branches/users/sagen/applepush:8126-8184
</span><span class="cx">/CalendarServer/branches/users/sagen/inboxitems:7380-7381
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources:5032-5051
</span><span class="cx">/CalendarServer/branches/users/sagen/locations-resources-2:5052-5061
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who:12819-12860
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-2:12861-12898
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-3:12899-12913
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-4:12914-13157
</span><span class="cx">/CalendarServer/branches/users/sagen/move2who-5:13158-13163
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua:13309-13327
</span><span class="cx">/CalendarServer/branches/users/sagen/newcua-1:13328-13330
</span><span class="cx">/CalendarServer/branches/users/sagen/purge_old_events:6735-6746
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes:13648-13656
</span><span class="cx">/CalendarServer/branches/users/sagen/recordtypes-2:13657
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4038:4040-4067
</span><span class="cx">/CalendarServer/branches/users/sagen/resource-delegates-4066:4068-4075
</span><span class="cx">/CalendarServer/branches/users/sagen/resources-2:5084-5093
</span><span class="cx">/CalendarServer/branches/users/sagen/testing:10827-10851,10853-10855
</span><span class="cx">/CalendarServer/branches/users/wsanchez/psycopg2cffi:14427-14439
</span><span class="cx">/CalendarServer/branches/users/wsanchez/transations:5515-5593
</span><a id="CalendarServertrunktxdavbasedatastoretesttest_subpostgrespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/base/datastore/test/test_subpostgres.py 2015-02-19 02:16:17 UTC (rev 14440)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, Deferred
</span><span class="cx"> from twisted.application.service import Service
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> class SubprocessStartup(TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for starting and stopping the subprocess.
</span><span class="lines">@@ -44,6 +46,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> test = self
</span><ins>+
</ins><span class="cx"> class SimpleService1(Service):
</span><span class="cx">
</span><span class="cx"> instances = []
</span><span class="lines">@@ -82,7 +85,7 @@
</span><span class="cx"> cursor = connection.cursor()
</span><span class="cx"> cursor.execute("select * from test_dummy_table")
</span><span class="cx"> values = cursor.fetchall()
</span><del>- self.assertEquals(values, [["dummy"]])
</del><ins>+ self.assertEquals(map(list, values), [["dummy"]])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -95,6 +98,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> test = self
</span><ins>+
</ins><span class="cx"> class SimpleService2(Service):
</span><span class="cx">
</span><span class="cx"> instances = []
</span><span class="lines">@@ -134,7 +138,7 @@
</span><span class="cx"> cursor = connection.cursor()
</span><span class="cx"> cursor.execute("select * from test_dummy_table")
</span><span class="cx"> values = cursor.fetchall()
</span><del>- self.assertEquals(values, [["dummy"]])
</del><ins>+ self.assertEquals(map(list, values), [["dummy"]])
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="lines">@@ -147,6 +151,7 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> test = self
</span><ins>+
</ins><span class="cx"> class SimpleService1(Service):
</span><span class="cx">
</span><span class="cx"> instances = []
</span><span class="lines">@@ -171,8 +176,11 @@
</span><span class="cx"> finally:
</span><span class="cx"> cursor.close()
</span><span class="cx">
</span><del>- # The SQL in importFile.sql will get executed, including the insertion of "value1"
- importFileName = CachingFilePath(__file__).parent().child("importFile.sql").path
</del><ins>+ # The SQL in importFile.sql will get executed, including the insertion
+ # of "value1"
+ importFileName = (
+ CachingFilePath(__file__).parent().child("importFile.sql").path
+ )
</ins><span class="cx"> svc = PostgresService(
</span><span class="cx"> CachingFilePath("postgres_3.pgdb"),
</span><span class="cx"> SimpleService1,
</span><span class="lines">@@ -188,4 +196,4 @@
</span><span class="cx"> cursor = connection.cursor()
</span><span class="cx"> cursor.execute("select * from import_test_table")
</span><span class="cx"> values = cursor.fetchall()
</span><del>- self.assertEquals(values, [["value1"], ["value2"]])
</del><ins>+ self.assertEquals(map(list, values), [["value1"], ["value2"]])
</ins></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoreschedulingimiptesttest_outboundpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/caldav/datastore/scheduling/imip/test/test_outbound.py 2015-02-19 02:16:17 UTC (rev 14440)
</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="CalendarServertrunktxdavcarddavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/carddav/datastore/test/test_sql.py 2015-02-19 02:16:17 UTC (rev 14440)
</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="CalendarServertrunktxdavcommondatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/test_sql.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/common/datastore/test/test_sql.py 2015-02-19 02:16:17 UTC (rev 14440)
</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="CalendarServertrunktxdavcommondatastoreupgradesqltesttest_upgrade_with_datapy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/common/datastore/upgrade/sql/test/test_upgrade_with_data.py 2015-02-19 02:16:17 UTC (rev 14440)
</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="CalendarServertrunktxdavwhotesttest_delegatespy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/test/test_delegates.py (14439 => 14440)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/test/test_delegates.py 2015-02-19 01:19:55 UTC (rev 14439)
+++ CalendarServer/trunk/txdav/who/test/test_delegates.py 2015-02-19 02:16:17 UTC (rev 14440)
</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>