diff options
Diffstat (limited to 'python/qpid/tests')
| -rw-r--r-- | python/qpid/tests/messaging/__init__.py | 11 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/endpoints.py | 19 | ||||
| -rw-r--r-- | python/qpid/tests/messaging/message.py | 2 |
3 files changed, 22 insertions, 10 deletions
diff --git a/python/qpid/tests/messaging/__init__.py b/python/qpid/tests/messaging/__init__.py index c3581efb9d..b2a600982a 100644 --- a/python/qpid/tests/messaging/__init__.py +++ b/python/qpid/tests/messaging/__init__.py @@ -143,4 +143,15 @@ class Base(Test): def reconnect(self): return self.get_bool("reconnect") + + def transport(self): + if self.broker.scheme == self.broker.AMQPS: + return "tls" + else: + return "plain" + + def connection_options(self): + return {"reconnect": self.reconnect(), + "transport": self.transport()} + import address, endpoints, message diff --git a/python/qpid/tests/messaging/endpoints.py b/python/qpid/tests/messaging/endpoints.py index b1f00b680c..aced76feac 100644 --- a/python/qpid/tests/messaging/endpoints.py +++ b/python/qpid/tests/messaging/endpoints.py @@ -30,13 +30,13 @@ class SetupTests(Base): def testOpen(self): # XXX: need to flesh out URL support/syntax self.conn = Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) self.ping(self.conn.session()) def testConnect(self): # XXX: need to flesh out URL support/syntax self.conn = Connection(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) self.conn.connect() self.ping(self.conn.session()) @@ -65,7 +65,8 @@ class SetupTests(Base): for i in range(32): if fds: os.close(fds.pop()) for i in xrange(64): - conn = Connection.open(self.broker.host, self.broker.port) + conn = Connection.open(self.broker.host, self.broker.port, + **self.connection_options()) conn.close() finally: while fds: @@ -75,7 +76,7 @@ class ConnectionTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def testSessionAnon(self): ssn1 = self.conn.session() @@ -118,7 +119,7 @@ class SessionTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() @@ -405,7 +406,7 @@ class ReceiverTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() @@ -575,7 +576,7 @@ class AddressTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() @@ -846,7 +847,7 @@ class AddressErrorTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() @@ -913,7 +914,7 @@ class SenderTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() diff --git a/python/qpid/tests/messaging/message.py b/python/qpid/tests/messaging/message.py index f2701af64b..9272be7fa4 100644 --- a/python/qpid/tests/messaging/message.py +++ b/python/qpid/tests/messaging/message.py @@ -54,7 +54,7 @@ class MessageEchoTests(Base): def setup_connection(self): return Connection.open(self.broker.host, self.broker.port, - reconnect=self.reconnect()) + **self.connection_options()) def setup_session(self): return self.conn.session() |