<!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>[13318] CalendarServer/trunk/calendarserver</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/13318">13318</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-04-18 08:01:12 -0700 (Fri, 18 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Mostly whitespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_caldavpy">CalendarServer/trunk/calendarserver/tap/test/test_caldav.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertaptesttest_utilpy">CalendarServer/trunk/calendarserver/tap/test/test_util.py</a></li>
<li><a href="#CalendarServertrunkcalendarservertoolstesttest_gatewaypy">CalendarServer/trunk/calendarserver/tools/test/test_gateway.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkcalendarservertaptesttest_caldavpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2014-04-18 14:29:33 UTC (rev 13317)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2014-04-18 15:01:12 UTC (rev 13318)
</span><span class="lines">@@ -360,34 +360,40 @@
</span><span class="cx"> self.options.parent["nodaemon"] = None
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CalDAVServiceMakerTestSingle(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="cx"> super(CalDAVServiceMakerTestSingle, self).configure()
</span><span class="cx"> config.ProcessType = "Single"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_makeService(self):
</span><span class="cx"> CalDAVServiceMaker().makeService(self.options)
</span><span class="cx"> # No error
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CalDAVServiceMakerTestSlave(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="cx"> super(CalDAVServiceMakerTestSlave, self).configure()
</span><span class="cx"> config.ProcessType = "Slave"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_makeService(self):
</span><span class="cx"> CalDAVServiceMaker().makeService(self.options)
</span><span class="cx"> # No error
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CalDAVServiceMakerTestUnknown(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="cx"> super(CalDAVServiceMakerTestUnknown, self).configure()
</span><span class="cx"> config.ProcessType = "Unknown"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_makeService(self):
</span><span class="cx"> self.assertRaises(UsageError, CalDAVServiceMaker().makeService, self.options)
</span><span class="cx"> # error
</span><span class="lines">@@ -432,12 +438,14 @@
</span><span class="cx"> self.assertEquals(socketService.gid, self.alternateGroup)
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ProcessMonitorTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="cx"> super(ProcessMonitorTests, self).configure()
</span><span class="cx"> config.ProcessType = "Combined"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_processMonitor(self):
</span><span class="cx"> """
</span><span class="cx"> In the master, there should be exactly one
</span><span class="lines">@@ -483,7 +491,6 @@
</span><span class="cx"> def directoryService(self):
</span><span class="cx"> return self.directory
</span><span class="cx">
</span><del>-
</del><span class="cx"> store = NotAStore(self.directory)
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -516,10 +523,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
-
-
</del><span class="cx"> class SlaveServiceTests(CalDAVServiceMakerTestBase):
</span><span class="cx"> """
</span><span class="cx"> Test various configurations of the Slave service
</span><span class="lines">@@ -626,6 +629,7 @@
</span><span class="cx"> # config.SSLCertificate = pemFile
</span><span class="cx"> # config.EnableSSL = True
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_noSSL(self):
</span><span class="cx"> """
</span><span class="cx"> Test the single service to make sure there is no SSL Service when SSL
</span><span class="lines">@@ -641,6 +645,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class NoHTTPTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="lines">@@ -652,6 +657,7 @@
</span><span class="cx"> config.SSLCertificate = pemFile
</span><span class="cx"> config.EnableSSL = True
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_noHTTP(self):
</span><span class="cx"> """
</span><span class="cx"> Test the single service to make sure there is no TCPServer when
</span><span class="lines">@@ -667,6 +673,7 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class SingleBindAddressesTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="lines">@@ -675,6 +682,7 @@
</span><span class="cx"> config.HTTPPort = 8008
</span><span class="cx"> config.BindAddresses = ["127.0.0.1"]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_singleBindAddresses(self):
</span><span class="cx"> """
</span><span class="cx"> Test that the TCPServer and SSLServers are bound to the proper address
</span><span class="lines">@@ -688,6 +696,7 @@
</span><span class="cx"> self.assertEquals(s.kwargs["interface"], "127.0.0.1")
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MultipleBindAddressesTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def configure(self):
</span><span class="lines">@@ -705,6 +714,7 @@
</span><span class="cx"> "172.53.13.123",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_multipleBindAddresses(self):
</span><span class="cx"> """
</span><span class="cx"> Test that the TCPServer and SSLServers are bound to the proper
</span><span class="lines">@@ -758,6 +768,7 @@
</span><span class="cx"> "172.53.13.123",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_listenBacklog(self):
</span><span class="cx"> """
</span><span class="cx"> Test that the backlog arguments is set in TCPServer and SSLServers
</span><span class="lines">@@ -822,6 +833,7 @@
</span><span class="cx"> config.Authentication.Kerberos.ServicePrincipal = ""
</span><span class="cx"> config.Authentication.Basic.Enabled = True
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_servicePrincipalNone(self):
</span><span class="cx"> """
</span><span class="cx"> Test that the Kerberos principal look is attempted if the principal is empty.
</span><span class="lines">@@ -860,8 +872,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
-
</del><span class="cx"> class ResourceTests(CalDAVServiceMakerTestBase):
</span><span class="cx">
</span><span class="cx"> def test_LogWrapper(self):
</span><span class="lines">@@ -1318,7 +1328,7 @@
</span><span class="cx"> return 45
</span><span class="cx">
</span><span class="cx"> return type(getSystemIDs)(
</span><del>- getSystemIDs.func_code,
</del><ins>+ getSystemIDs.func_code, #@UndefinedVariable
</ins><span class="cx"> {
</span><span class="cx"> "getpwnam": _getpwnam,
</span><span class="cx"> "getgrnam": _getgrnam,
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertaptesttest_utilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2014-04-18 14:29:33 UTC (rev 13317)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2014-04-18 15:01:12 UTC (rev 13318)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Stub classes for MemoryLimitServiceTestCase
</span><span class="cx">
</span><span class="cx"> class StubProtocol(object):
</span></span></pre></div>
<a id="CalendarServertrunkcalendarservertoolstesttest_gatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py (13317 => 13318)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-04-18 14:29:33 UTC (rev 13317)
+++ CalendarServer/trunk/calendarserver/tools/test/test_gateway.py 2014-04-18 15:01:12 UTC (rev 13318)
</span><span class="lines">@@ -16,7 +16,6 @@
</span><span class="cx"> from __future__ import print_function
</span><span class="cx">
</span><span class="cx"> import os
</span><del>-import sys
</del><span class="cx"> from plistlib import readPlistFromString
</span><span class="cx"> import xml
</span><span class="cx">
</span><span class="lines">@@ -254,7 +253,6 @@
</span><span class="cx"> "Created Address 01 %s %s" % (unichr(208), u"\ud83d\udca3")
</span><span class="cx"> )
</span><span class="cx">
</span><del>-
</del><span class="cx"> self.assertEquals(record.abbreviatedName, "Addr1")
</span><span class="cx"> self.assertEquals(record.streetAddress, "1 Infinite Loop\nCupertino, 95014\nCA")
</span><span class="cx"> self.assertEquals(record.geographicLocation, "geo:37.331,-122.030")
</span></span></pre>
</div>
</div>
</body>
</html>