<!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>[14634] CalendarServer/trunk/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/14634">14634</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2015-03-30 09:59:34 -0700 (Mon, 30 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix default calendar related unit tests to work with trash</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy">CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoresqlpy">CalendarServer/trunk/txdav/common/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_sqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py (14633 => 14634)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-30 16:19:36 UTC (rev 14633)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_sql.py 2015-03-30 16:59:34 UTC (rev 14634)
</span><span class="lines">@@ -1218,12 +1218,14 @@
</span><span class="cx"> home = yield self.transactionUnderTest().calendarHomeWithUID("home_defaults")
</span><span class="cx"> self.assertEqual(home._default_events, default_events._resourceID)
</span><span class="cx"> self.assertEqual(home._default_tasks, default_tasks._resourceID)
</span><del>- yield home.removeCalendarWithName("calendar_1-vtodo", bypassTrash=True)
</del><ins>+ yield home.removeCalendarWithName("calendar_1-vtodo", bypassTrash=False)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> home = yield self.transactionUnderTest().calendarHomeWithUID("home_defaults")
</span><del>- self.assertEqual(home._default_events, default_events._resourceID)
- self.assertEqual(home._default_tasks, None)
</del><ins>+ default_events = yield home.defaultCalendar("VEVENT", create=False)
+ self.assertTrue(default_events is not None)
+ default_tasks = yield home.defaultCalendar("VTODO", create=False)
+ self.assertTrue(default_tasks is None)
</ins><span class="cx">
</span><span class="cx"> default_tasks2 = yield home.defaultCalendar("VTODO")
</span><span class="cx"> self.assertTrue(default_tasks2 is not None)
</span><span class="lines">@@ -1290,19 +1292,19 @@
</span><span class="cx"> calendar1 = yield home.calendarWithName("calendar_1")
</span><span class="cx"> default_events = yield home.defaultCalendar("VEVENT")
</span><span class="cx"> self.assertTrue(default_events is not None)
</span><del>- self.assertEqual(home._default_events, calendar1._resourceID)
</del><ins>+ self.assertEqual(default_events._resourceID, calendar1._resourceID)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> home = yield self.homeUnderTest(name="home_defaults")
</span><span class="cx"> calendar1 = yield home.calendarWithName("calendar_1")
</span><del>- yield calendar1.remove(bypassTrash=True)
</del><ins>+ yield calendar1.remove(bypassTrash=False)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> home = yield self.homeUnderTest(name="home_defaults")
</span><del>- self.assertEqual(home._default_events, None)
- self.assertEqual(home._default_tasks, None)
- calendars = yield home.listCalendars()
- self.assertEqual(calendars, ["inbox", ])
</del><ins>+ default_events = yield home.defaultCalendar("VEVENT", create=False)
+ self.assertEqual(default_events, None)
+ default_tasks = yield home.defaultCalendar("VTODO", create=False)
+ self.assertEqual(default_tasks, None)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx"> home = yield self.homeUnderTest(name="home_defaults")
</span><span class="lines">@@ -1314,11 +1316,40 @@
</span><span class="cx"> calendar1 = yield home.calendarWithName(default_events.name())
</span><span class="cx"> default_events = yield home.defaultCalendar("VEVENT")
</span><span class="cx"> self.assertTrue(default_events is not None)
</span><del>- self.assertEqual(home._default_events, calendar1._resourceID)
</del><ins>+ self.assertEqual(default_events._resourceID, calendar1._resourceID)
</ins><span class="cx"> yield self.commit()
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_defaultCalendar_delete_and_recover(self):
+ """
+ Make sure a default_events calendar is re-assigned after recovering from trash
+ """
+
+ if config.EnableTrashCollection:
+ home = yield self.homeUnderTest(name="home_defaults")
+ calendar1 = yield home.calendarWithName("calendar_1")
+ default_events = yield home.defaultCalendar("VEVENT")
+ self.assertEqual(default_events._resourceID, calendar1._resourceID)
+ yield self.commit()
+
+ home = yield self.homeUnderTest(name="home_defaults")
+ calendar1 = yield home.calendarWithName("calendar_1")
+ yield calendar1.remove(bypassTrash=False)
+ default_events = yield home.defaultCalendar("VEVENT", create=False)
+ self.assertTrue(default_events is None)
+ yield self.commit()
+
+ home = yield self.homeUnderTest(name="home_defaults")
+ trashChildren = yield home.children(onlyInTrash=True)
+ calendar1 = trashChildren[0]
+ yield calendar1.fromTrash()
+ default_events = yield home.defaultCalendar("VEVENT")
+ self.assertEqual(default_events._resourceID, calendar1._resourceID)
+ yield self.commit()
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_resourceLock(self):
</span><span class="cx"> """
</span><span class="cx"> Test CommonObjectResource.lock to make sure it locks, raises on missing resource,
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/sql.py (14633 => 14634)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-30 16:19:36 UTC (rev 14633)
+++ CalendarServer/trunk/txdav/common/datastore/sql.py 2015-03-30 16:59:34 UTC (rev 14634)
</span><span class="lines">@@ -3518,10 +3518,7 @@
</span><span class="cx"> )
</span><span class="cx"> newName = "{}-{}".format(self._name[:36], str(uuid4()))
</span><span class="cx"> yield self.rename(newName)
</span><del>- # yield self.notifyPropertyChanged()
- # yield self.invalidateQueryCache()
</del><span class="cx"> yield self._deletedSyncToken()
</span><del>- # yield self._home.notifyChanged()
</del><span class="cx">
</span><span class="cx"> # Update _children cache to reflect moving to trash
</span><span class="cx"> try:
</span></span></pre>
</div>
</div>
</body>
</html>