<!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>[15001] 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/15001">15001</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-07-27 09:15:01 -0700 (Mon, 27 Jul 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix test taking too long.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad1ics">CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics</a></li>
<li><a href="#CalendarServertrunktxdavcaldavdatastoretesttest_filepy">CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py</a></li>
<li><a href="#CalendarServertrunktxdavcommondatastoretestutilpy">CalendarServer/trunk/txdav/common/datastore/test/util.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavcaldavdatastoretestcalendar_storehomehome_badcalendar_bad1ics"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics (15000 => 15001)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics        2015-07-27 15:12:16 UTC (rev 15000)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/calendar_store/ho/me/home_bad/calendar_bad/1.ics        2015-07-27 16:15:01 UTC (rev 15001)
</span><span class="lines">@@ -20,11 +20,11 @@
</span><span class="cx"> END:STANDARD
</span><span class="cx"> END:VTIMEZONE
</span><span class="cx"> BEGIN:VEVENT
</span><del>-DTEND;TZID=US/Pacific:20000324T124500
</del><ins>+DTEND;TZID=US/Pacific:%(now-1)s0324T124500
</ins><span class="cx"> UID:uid1
</span><span class="cx"> DTSTAMP:20090326T145447Z
</span><span class="cx"> SUMMARY:Busted
</span><del>-DTSTART;TZID=US/Pacific:20000324T121500
</del><ins>+DTSTART;TZID=US/Pacific:%(now-1)s0324T121500
</ins><span class="cx"> CREATED:20090326T145440Z
</span><span class="cx"> RRULE:FREQ=HOURLY
</span><span class="cx"> END:VEVENT
</span></span></pre></div>
<a id="CalendarServertrunktxdavcaldavdatastoretesttest_filepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py (15000 => 15001)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py        2015-07-27 15:12:16 UTC (rev 15000)
+++ CalendarServer/trunk/txdav/caldav/datastore/test/test_file.py        2015-07-27 16:15:01 UTC (rev 15001)
</span><span class="lines">@@ -65,14 +65,19 @@
</span><span class="cx">     storePath.copyTo(calendarPath)
</span><span class="cx"> 
</span><span class="cx">     # Set year values to current year
</span><ins>+    subs = {}
</ins><span class="cx">     nowYear = DateTime.getToday().getYear()
</span><ins>+    subs[&quot;now&quot;] = nowYear
+    for i in range(1, 10):
+        subs[&quot;now-{}&quot;.format(i)] = nowYear - 1
+        subs[&quot;now+{}&quot;.format(i)] = nowYear + 1
</ins><span class="cx">     for home in calendarPath.child(&quot;ho&quot;).child(&quot;me&quot;).children():
</span><span class="cx">         if not home.basename().startswith(&quot;.&quot;):
</span><span class="cx">             for calendar in home.children():
</span><span class="cx">                 if not calendar.basename().startswith(&quot;.&quot;):
</span><span class="cx">                     for resource in calendar.children():
</span><span class="cx">                         if resource.basename().endswith(&quot;.ics&quot;):
</span><del>-                            resource.setContent(resource.getContent() % {&quot;now&quot;: nowYear})
</del><ins>+                            resource.setContent(resource.getContent() % subs)
</ins><span class="cx"> 
</span><span class="cx">     testID = test.id()
</span><span class="cx">     test.counter = 0
</span></span></pre></div>
<a id="CalendarServertrunktxdavcommondatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/common/datastore/test/util.py (15000 => 15001)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/common/datastore/test/util.py        2015-07-27 15:12:16 UTC (rev 15000)
+++ CalendarServer/trunk/txdav/common/datastore/test/util.py        2015-07-27 16:15:01 UTC (rev 15001)
</span><span class="lines">@@ -546,8 +546,13 @@
</span><span class="cx">     current year.
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><ins>+    subs = {}
</ins><span class="cx">     nowYear = DateTime.getToday().getYear()
</span><del>-    return data % {&quot;now&quot;: nowYear}
</del><ins>+    subs[&quot;now&quot;] = nowYear
+    for i in range(1, 10):
+        subs[&quot;now-{}&quot;.format(i)] = nowYear - 1
+        subs[&quot;now+{}&quot;.format(i)] = nowYear + 1
+    return data % subs
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>