[CalendarServer-changes] [13318] CalendarServer/trunk/calendarserver
source_changes at macosforge.org
source_changes at macosforge.org
Fri Apr 18 08:01:13 PDT 2014
Revision: 13318
http://trac.calendarserver.org//changeset/13318
Author: cdaboo at apple.com
Date: 2014-04-18 08:01:12 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Mostly whitespace.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
CalendarServer/trunk/calendarserver/tap/test/test_util.py
CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- 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)
@@ -360,34 +360,40 @@
self.options.parent["nodaemon"] = None
+
class CalDAVServiceMakerTestSingle(CalDAVServiceMakerTestBase):
def configure(self):
super(CalDAVServiceMakerTestSingle, self).configure()
config.ProcessType = "Single"
+
def test_makeService(self):
CalDAVServiceMaker().makeService(self.options)
# No error
+
class CalDAVServiceMakerTestSlave(CalDAVServiceMakerTestBase):
def configure(self):
super(CalDAVServiceMakerTestSlave, self).configure()
config.ProcessType = "Slave"
+
def test_makeService(self):
CalDAVServiceMaker().makeService(self.options)
# No error
+
class CalDAVServiceMakerTestUnknown(CalDAVServiceMakerTestBase):
def configure(self):
super(CalDAVServiceMakerTestUnknown, self).configure()
config.ProcessType = "Unknown"
+
def test_makeService(self):
self.assertRaises(UsageError, CalDAVServiceMaker().makeService, self.options)
# error
@@ -432,12 +438,14 @@
self.assertEquals(socketService.gid, self.alternateGroup)
+
class ProcessMonitorTests(CalDAVServiceMakerTestBase):
def configure(self):
super(ProcessMonitorTests, self).configure()
config.ProcessType = "Combined"
+
def test_processMonitor(self):
"""
In the master, there should be exactly one
@@ -483,7 +491,6 @@
def directoryService(self):
return self.directory
-
store = NotAStore(self.directory)
@@ -516,10 +523,6 @@
-
-
-
-
class SlaveServiceTests(CalDAVServiceMakerTestBase):
"""
Test various configurations of the Slave service
@@ -626,6 +629,7 @@
# config.SSLCertificate = pemFile
# config.EnableSSL = True
+
def test_noSSL(self):
"""
Test the single service to make sure there is no SSL Service when SSL
@@ -641,6 +645,7 @@
)
+
class NoHTTPTests(CalDAVServiceMakerTestBase):
def configure(self):
@@ -652,6 +657,7 @@
config.SSLCertificate = pemFile
config.EnableSSL = True
+
def test_noHTTP(self):
"""
Test the single service to make sure there is no TCPServer when
@@ -667,6 +673,7 @@
)
+
class SingleBindAddressesTests(CalDAVServiceMakerTestBase):
def configure(self):
@@ -675,6 +682,7 @@
config.HTTPPort = 8008
config.BindAddresses = ["127.0.0.1"]
+
def test_singleBindAddresses(self):
"""
Test that the TCPServer and SSLServers are bound to the proper address
@@ -688,6 +696,7 @@
self.assertEquals(s.kwargs["interface"], "127.0.0.1")
+
class MultipleBindAddressesTests(CalDAVServiceMakerTestBase):
def configure(self):
@@ -705,6 +714,7 @@
"172.53.13.123",
]
+
def test_multipleBindAddresses(self):
"""
Test that the TCPServer and SSLServers are bound to the proper
@@ -758,6 +768,7 @@
"172.53.13.123",
]
+
def test_listenBacklog(self):
"""
Test that the backlog arguments is set in TCPServer and SSLServers
@@ -822,6 +833,7 @@
config.Authentication.Kerberos.ServicePrincipal = ""
config.Authentication.Basic.Enabled = True
+
def test_servicePrincipalNone(self):
"""
Test that the Kerberos principal look is attempted if the principal is empty.
@@ -860,8 +872,6 @@
-
-
class ResourceTests(CalDAVServiceMakerTestBase):
def test_LogWrapper(self):
@@ -1318,7 +1328,7 @@
return 45
return type(getSystemIDs)(
- getSystemIDs.func_code,
+ getSystemIDs.func_code, #@UndefinedVariable
{
"getpwnam": _getpwnam,
"getgrnam": _getgrnam,
Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py
===================================================================
--- 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)
@@ -53,7 +53,6 @@
-
# Stub classes for MemoryLimitServiceTestCase
class StubProtocol(object):
Modified: CalendarServer/trunk/calendarserver/tools/test/test_gateway.py
===================================================================
--- 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)
@@ -16,7 +16,6 @@
from __future__ import print_function
import os
-import sys
from plistlib import readPlistFromString
import xml
@@ -254,7 +253,6 @@
"Created Address 01 %s %s" % (unichr(208), u"\ud83d\udca3")
)
-
self.assertEquals(record.abbreviatedName, "Addr1")
self.assertEquals(record.streetAddress, "1 Infinite Loop\nCupertino, 95014\nCA")
self.assertEquals(record.geographicLocation, "geo:37.331,-122.030")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140418/07401ffe/attachment.html>
More information about the calendarserver-changes
mailing list