Author: rhs
Date: Thu Oct 25 17:29:14 2012
New Revision: 1402224
URL: http://svn.apache.org/viewvc?rev=1402224&view=rev
Log:
gracefully skip ssl tests when ssl is not built
Modified:
qpid/proton/trunk/proton-c/bindings/python/proton.py
qpid/proton/trunk/tests/proton_tests/common.py
qpid/proton/trunk/tests/proton_tests/ssl.py
Modified: qpid/proton/trunk/proton-c/bindings/python/proton.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/proton.py?rev=1402224&r1=1402223&r2=1402224&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/proton.py (original)
+++ qpid/proton/trunk/proton-c/bindings/python/proton.py Thu Oct 25 17:29:14
2012
@@ -2088,6 +2088,9 @@ class SASL(object):
class SSLException(TransportException):
pass
+class SSLUnavailable(SSLException):
+ pass
+
class SSL(object):
def _check(self, err):
@@ -2099,6 +2102,8 @@ class SSL(object):
def __init__(self, transport):
self._ssl = pn_ssl(transport._trans)
+ if self._ssl is None:
+ raise SSLUnavailable()
MODE_CLIENT = PN_SSL_MODE_CLIENT
MODE_SERVER = PN_SSL_MODE_SERVER
@@ -2144,4 +2149,4 @@ __all__ = ["Messenger", "Message", "Prot
"Session", "Link", "Terminus", "Sender", "Receiver", "Delivery",
"Transport", "TransportException", "SASL", "SSL", "Described",
"Array", "symbol", "char", "timestamp", "ulong", "UNDESCRIBED",
- "PN_SESSION_WINDOW"]
+ "SSLUnavailable", "PN_SESSION_WINDOW"]
Modified: qpid/proton/trunk/tests/proton_tests/common.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/common.py?rev=1402224&r1=1402223&r2=1402224&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/common.py (original)
+++ qpid/proton/trunk/tests/proton_tests/common.py Thu Oct 25 17:29:14 2012
@@ -21,3 +21,6 @@ class Test:
def __init__(self, name):
self.name = name
+
+class Skipped(Exception):
+ skipped = True
Modified: qpid/proton/trunk/tests/proton_tests/ssl.py
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/tests/proton_tests/ssl.py?rev=1402224&r1=1402223&r2=1402224&view=diff
==============================================================================
--- qpid/proton/trunk/tests/proton_tests/ssl.py (original)
+++ qpid/proton/trunk/tests/proton_tests/ssl.py Thu Oct 25 17:29:14 2012
@@ -20,6 +20,7 @@
import os, common
import subprocess
from proton import *
+from common import Skipped
class SslTest(common.Test):
@@ -28,12 +29,15 @@ class SslTest(common.Test):
common.Test.__init__(self, *args)
def setup(self):
- self.t_server = Transport()
- self.server = SSL(self.t_server)
- self.server.init(SSL.MODE_SERVER)
- self.t_client = Transport()
- self.client = SSL(self.t_client)
- self.client.init(SSL.MODE_CLIENT)
+ try:
+ self.t_server = Transport()
+ self.server = SSL(self.t_server)
+ self.server.init(SSL.MODE_SERVER)
+ self.t_client = Transport()
+ self.client = SSL(self.t_client)
+ self.client.init(SSL.MODE_CLIENT)
+ except SSLUnavailable, e:
+ raise Skipped(e)
def teardown(self):
self.t_client = None
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
