[CalendarServer-changes] [15222] CalendarServer/trunk
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 23 13:39:25 PDT 2015
Revision: 15222
http://trac.calendarserver.org//changeset/15222
Author: cdaboo at apple.com
Date: 2015-10-23 13:39:25 -0700 (Fri, 23 Oct 2015)
Log Message:
-----------
Unit test fixes.
Modified Paths:
--------------
CalendarServer/trunk/calendarserver/push/test/test_applepush.py
CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
CalendarServer/trunk/calendarserver/tap/test/test_util.py
CalendarServer/trunk/calendarserver/tools/config.py
CalendarServer/trunk/calendarserver/webadmin/config.py
CalendarServer/trunk/txweb2/test/test_http.py
Modified: CalendarServer/trunk/calendarserver/push/test/test_applepush.py
===================================================================
--- CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/push/test/test_applepush.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -49,6 +49,7 @@
"PrivateKeyPath" : "caldav.pem",
"AuthorityChainPath" : "chain.pem",
"Passphrase" : "",
+ "KeychainIdentity": "org.calendarserver.test",
"Topic" : "caldav_topic",
},
"CardDAV" : {
@@ -56,6 +57,7 @@
"PrivateKeyPath" : "carddav.pem",
"AuthorityChainPath" : "chain.pem",
"Passphrase" : "",
+ "KeychainIdentity": "org.calendarserver.test",
"Topic" : "carddav_topic",
},
}
Modified: CalendarServer/trunk/calendarserver/tap/test/test_caldav.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tap/test/test_caldav.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -597,6 +597,7 @@
pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
config.SSLPrivateKey = pemFile
config.SSLCertificate = pemFile
+ config.SSLKeychainIdentity = "org.calendarserver.test"
config.EnableSSL = True
@@ -716,6 +717,7 @@
pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
config.SSLPrivateKey = pemFile
config.SSLCertificate = pemFile
+ config.SSLKeychainIdentity = "org.calendarserver.test"
config.EnableSSL = True
@@ -768,6 +770,7 @@
pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
config.SSLPrivateKey = pemFile
config.SSLCertificate = pemFile
+ config.SSLKeychainIdentity = "org.calendarserver.test"
config.EnableSSL = True
config.BindAddresses = [
"127.0.0.1",
@@ -822,6 +825,7 @@
pemFile = os.path.join(sourceRoot, "twistedcaldav/test/data/server.pem")
config.SSLPrivateKey = pemFile
config.SSLCertificate = pemFile
+ config.SSLKeychainIdentity = "org.calendarserver.test"
config.EnableSSL = True
config.BindAddresses = [
"127.0.0.1",
Modified: CalendarServer/trunk/calendarserver/tap/test/test_util.py
===================================================================
--- CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tap/test/test_util.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -246,6 +246,7 @@
ConfigDict(
{
"SSLCertificate": "missing",
+ "SSLKeychainIdentity": "missing",
}
)
)
@@ -259,6 +260,7 @@
ConfigDict(
{
"SSLCertificate": certFilePath.path,
+ "SSLKeychainIdentity": "missing",
}
)
)
@@ -278,6 +280,7 @@
"SSLAuthorityChain": "",
"SSLMethod": "SSLv3_METHOD",
"SSLCiphers": "ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM",
+ "SSLKeychainIdentity": "missing",
}
)
)
Modified: CalendarServer/trunk/calendarserver/tools/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/tools/config.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/tools/config.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -79,6 +79,7 @@
"SSLCertificate",
"SSLPort",
"SSLPrivateKey",
+ "SSLKeychainIdentity",
]
READONLY_CONFIG_KEYS = [
Modified: CalendarServer/trunk/calendarserver/webadmin/config.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/config.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/calendarserver/webadmin/config.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -59,6 +59,7 @@
"SSLCertificate",
"SSLPrivateKey",
"SSLAuthorityChain",
+ "SSLKeychainIdentity",
"SSLMethod",
"SSLCiphers",
"EnableCalDAV",
Modified: CalendarServer/trunk/txweb2/test/test_http.py
===================================================================
--- CalendarServer/trunk/txweb2/test/test_http.py 2015-10-23 20:38:33 UTC (rev 15221)
+++ CalendarServer/trunk/txweb2/test/test_http.py 2015-10-23 20:39:25 UTC (rev 15222)
@@ -18,6 +18,7 @@
from twisted.python import util, runtime
from txweb2.channel.http import SSLRedirectRequest, HTTPFactory, HTTPChannel
from twisted.internet.task import deferLater
+from twext.internet.ssl import ChainingOpenSSLContextFactory
class RedirectResponseTestCase(unittest.TestCase):
@@ -1362,7 +1363,10 @@
type = 'ssl'
def setUp(self):
HTTPChannel.allowPersistentConnections = True
- sCTX = ssl.DefaultOpenSSLContextFactory(certPath, certPath)
+ sCTX = ChainingOpenSSLContextFactory(
+ certPath, certPath,
+ keychainIdentity="org.calendarserver.test",
+ )
factory = SimpleFactory(requestFactory=SimpleRequest)
factory.testcase = self
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20151023/fe752f14/attachment-0001.html>
More information about the calendarserver-changes
mailing list