You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2018/02/26 22:46:20 UTC
qpid-interop-test git commit: QPIDIT-85: Added check for presnece of
broker when tests read the connection properties and aborts the test is no
broker is present. Shims for C++,
Python and RheaJs were modified to also exit if no broker is present, shims
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 1820e98b5 -> fb6f8541c
QPIDIT-85: Added check for presnece of broker when tests read the connection properties and aborts the test is no broker is present. Shims for C++, Python and RheaJs were modified to also exit if no broker is present, shims for Amqp.NetLite and QpidJms already exit with a connection error.
Project: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/commit/fb6f8541
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/fb6f8541
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/fb6f8541
Branch: refs/heads/master
Commit: fb6f8541cddd9ca37148fda76b004246505bb233
Parents: 1820e98
Author: Kim van der Riet <kv...@localhost.localdomain>
Authored: Mon Feb 26 17:45:55 2018 -0500
Committer: Kim van der Riet <kv...@localhost.localdomain>
Committed: Mon Feb 26 17:45:55 2018 -0500
----------------------------------------------------------------------
shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp | 8 +++++++-
shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp | 8 +++++++-
.../src/amqp_large_content_test/Receiver.py | 5 ++++-
.../src/amqp_large_content_test/Sender.py | 5 ++++-
.../src/amqp_types_test/Receiver.py | 5 ++++-
.../qpid-proton-python/src/amqp_types_test/Sender.py | 5 ++++-
.../src/jms_hdrs_props_test/Receiver.py | 5 ++++-
.../src/jms_hdrs_props_test/Sender.py | 5 ++++-
.../src/jms_messages_test/Receiver.py | 5 ++++-
.../src/jms_messages_test/Sender.py | 5 ++++-
shims/rhea-js/amqp_types_test/Receiver.js | 6 +++++-
shims/rhea-js/amqp_types_test/Sender.js | 3 ++-
.../qpid_interop_test/amqp_large_content_test.py | 14 +++++++++-----
src/python/qpid_interop_test/amqp_types_test.py | 14 +++++++++-----
src/python/qpid_interop_test/broker_properties.py | 13 ++++++++-----
src/python/qpid_interop_test/jms_hdrs_props_test.py | 14 +++++++++-----
src/python/qpid_interop_test/jms_messages_test.py | 14 +++++++++-----
src/python/qpid_interop_test/shims.py | 4 ++--
18 files changed, 99 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp b/shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp
index 4182209..c07e012 100644
--- a/shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/AmqpReceiverBase.cpp
@@ -22,8 +22,10 @@
#include "qpidit/AmqpReceiverBase.hpp"
#include <sstream>
+#include <proton/connection_options.hpp>
#include <proton/container.hpp>
#include <proton/receiver.hpp>
+#include <proton/reconnect_options.hpp>
#include <proton/thread_safe.hpp> // for proton::returned<>
namespace qpidit
@@ -40,7 +42,11 @@ namespace qpidit
void AmqpReceiverBase::on_container_start(proton::container &c) {
std::ostringstream oss;
oss << _brokerAddr << "/" << _queueName;
- c.open_receiver(oss.str());
+ proton::reconnect_options ro;
+ ro.max_attempts(2);
+ proton::connection_options co;
+ co.reconnect(ro);
+ c.open_receiver(oss.str(), co);
}
} // namespace qpidit
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp b/shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp
index fb8a240..66ee826 100644
--- a/shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp
+++ b/shims/qpid-proton-cpp/src/qpidit/AmqpSenderBase.cpp
@@ -22,7 +22,9 @@
#include "qpidit/AmqpSenderBase.hpp"
#include <sstream>
+#include <proton/connection_options.hpp>
#include <proton/container.hpp>
+#include <proton/reconnect_options.hpp>
#include <proton/thread_safe.hpp>
#include <proton/tracker.hpp>
@@ -44,7 +46,11 @@ namespace qpidit
void AmqpSenderBase::on_container_start(proton::container &c) {
std::ostringstream oss;
oss << _brokerAddr << "/" << _queueName;
- c.open_sender(oss.str());
+ proton::reconnect_options ro;
+ ro.max_attempts(2);
+ proton::connection_options co;
+ co.reconnect(ro);
+ c.open_sender(oss.str(), co);
}
void AmqpSenderBase::on_tracker_accept(proton::tracker &t) {
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py b/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
index 9fd785a..b207e4c 100755
--- a/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
+++ b/shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py
@@ -56,7 +56,7 @@ class AmqpLargeContentTestReceiver(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_receiver(connection, source=self.queue_name)
def on_message(self, event):
@@ -121,6 +121,9 @@ class AmqpLargeContentTestReceiver(proton.handlers.MessagingHandler):
return (int(elt_size * num_elts / 1024 / 1024), num_elts)
return None
+ def on_transport_error(self, event):
+ print('Receiver: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py b/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
index 5508ee0..09367b6 100755
--- a/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
+++ b/shims/qpid-proton-python/src/amqp_large_content_test/Sender.py
@@ -53,7 +53,7 @@ class AmqpLargeContentTestSender(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_sender(connection, target=self.queue_name)
def on_sendable(self, event):
@@ -129,6 +129,9 @@ class AmqpLargeContentTestSender(proton.handlers.MessagingHandler):
"""Event callback for when the broker disconnects with the client"""
self.sent = self.confirmed
+ def on_transport_error(self, event):
+ print('Sender: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_types_test/Receiver.py b/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
index 82c4c95..594d33a 100755
--- a/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
+++ b/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
@@ -59,7 +59,7 @@ class AmqpTypesTestReceiver(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_receiver(connection, source=self.queue_name)
def on_message(self, event):
@@ -121,6 +121,9 @@ class AmqpTypesTestReceiver(proton.handlers.MessagingHandler):
event.receiver.close()
event.connection.close()
+ def on_transport_error(self, event):
+ print('Receiver: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/amqp_types_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_types_test/Sender.py b/shims/qpid-proton-python/src/amqp_types_test/Sender.py
index 07bdb4e..a4664b7 100755
--- a/shims/qpid-proton-python/src/amqp_types_test/Sender.py
+++ b/shims/qpid-proton-python/src/amqp_types_test/Sender.py
@@ -56,7 +56,7 @@ class AmqpTypesTestSender(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_sender(connection, target=self.queue_name)
def on_sendable(self, event):
@@ -141,6 +141,9 @@ class AmqpTypesTestSender(proton.handlers.MessagingHandler):
"""Event callback for when the broker disconnects with the client"""
self.sent = self.confirmed
+ def on_transport_error(self, event):
+ print('Sender: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py b/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
index 20e4534..fb54111 100755
--- a/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
+++ b/shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py
@@ -78,7 +78,7 @@ class JmsHdrsPropsTestReceiver(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_receiver(connection, source=self.queue_name)
def on_message(self, event):
@@ -386,6 +386,9 @@ class JmsHdrsPropsTestReceiver(proton.handlers.MessagingHandler):
else:
pass # Ignore any other properties, brokers can add them and we don't know what they may be
+ def on_transport_error(self, event):
+ print('Receiver: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py b/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
index 4100891..020c4fd 100755
--- a/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
+++ b/shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py
@@ -67,7 +67,7 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_sender(connection, target=self.queue_name)
def on_sendable(self, event):
@@ -363,6 +363,9 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
raise InteropTestError('JmsSenderShim._add_jms_message_properties: ' +
'Unknown or unhandled message property type ?%s"' % value_type)
+ def on_transport_error(self, event):
+ print('Sender: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_messages_test/Receiver.py b/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
index c6dd7d2..967fd23 100755
--- a/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
+++ b/shims/qpid-proton-python/src/jms_messages_test/Receiver.py
@@ -65,7 +65,7 @@ class JmsMessagesTestReceiver(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_receiver(connection, source=self.queue_name)
def on_message(self, event):
@@ -276,6 +276,9 @@ class JmsMessagesTestReceiver(proton.handlers.MessagingHandler):
assert message.annotations[QPID_JMS_TYPE_ANNOTATION_NAME] == proton.byte(5)
return message.body
+ def on_transport_error(self, event):
+ print('Receiver: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/qpid-proton-python/src/jms_messages_test/Sender.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_messages_test/Sender.py b/shims/qpid-proton-python/src/jms_messages_test/Sender.py
index 418d612..eb7b4b2 100755
--- a/shims/qpid-proton-python/src/jms_messages_test/Sender.py
+++ b/shims/qpid-proton-python/src/jms_messages_test/Sender.py
@@ -62,7 +62,7 @@ class JmsMessagesTestSender(proton.handlers.MessagingHandler):
def on_start(self, event):
"""Event callback for when the client starts"""
- connection = event.container.connect(url=self.broker_url, sasl_enabled=False)
+ connection = event.container.connect(url=self.broker_url, sasl_enabled=False, reconnect=False)
event.container.create_sender(connection, target=self.queue_name)
def on_sendable(self, event):
@@ -272,6 +272,9 @@ class JmsMessagesTestSender(proton.handlers.MessagingHandler):
body=_compat.unicode(test_value_text),
annotations=create_annotation('JMS_TEXTMESSAGE_TYPE'))
+ def on_transport_error(self, event):
+ print('Sender: Broker not found at %s' % self.broker_url)
+
@staticmethod
def signal_handler(signal_number, _):
"""Signal handler"""
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/rhea-js/amqp_types_test/Receiver.js
----------------------------------------------------------------------
diff --git a/shims/rhea-js/amqp_types_test/Receiver.js b/shims/rhea-js/amqp_types_test/Receiver.js
index fa72a3b..94f886d 100755
--- a/shims/rhea-js/amqp_types_test/Receiver.js
+++ b/shims/rhea-js/amqp_types_test/Receiver.js
@@ -46,7 +46,7 @@ function Receiver(brokerAddr, brokerPort, queueName, amqpType, numTestValues) {
this.receivedValueList = [];
this.container = require('rhea');
- this.container.connect({'host':brokerAddr, 'port':brokerPort}).open_receiver(queueName);
+ this.container.connect({'host':brokerAddr, 'port':brokerPort, 'reconnect':false}).open_receiver(queueName);
this.processMessage = function(msgBody) {
// console.log("processMessage: amqpType=" + this.amqpType + "; msgBody=" + msgBody);
@@ -186,6 +186,10 @@ function Receiver(brokerAddr, brokerPort, queueName, amqpType, numTestValues) {
}
}
});
+
+ this.container.on('disconnected', function(context){
+ console.error('Unable to connet to broker')
+ });
}
var colonPos = args[0].indexOf(":");
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/shims/rhea-js/amqp_types_test/Sender.js
----------------------------------------------------------------------
diff --git a/shims/rhea-js/amqp_types_test/Sender.js b/shims/rhea-js/amqp_types_test/Sender.js
index b45103d..f663365 100755
--- a/shims/rhea-js/amqp_types_test/Sender.js
+++ b/shims/rhea-js/amqp_types_test/Sender.js
@@ -71,7 +71,7 @@ function Sender(brokerAddr, brokerPort, queueName, amqpType, testValues) {
this.total = testValues.length;
this.container = require('rhea');
- this.connection = this.container.connect({'host':brokerAddr, 'port':brokerPort}); //.open_sender(queueName);
+ this.connection = this.container.connect({'host':brokerAddr, 'port':brokerPort, 'reconnect':false}); //.open_sender(queueName);
this.connection.open_sender(queueName);
this.createMessage = function(testValue) {
@@ -331,6 +331,7 @@ function Sender(brokerAddr, brokerPort, queueName, amqpType, testValues) {
this.container.on('disconnected', function (context) {
sender.sent = sender.confirmed;
+ console.error('Unable to connet to broker')
});
}
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/amqp_large_content_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_large_content_test.py b/src/python/qpid_interop_test/amqp_large_content_test.py
index 9b9d809..08b935e 100755
--- a/src/python/qpid_interop_test/amqp_large_content_test.py
+++ b/src/python/qpid_interop_test/amqp_large_content_test.py
@@ -217,8 +217,12 @@ class AmqpLargeContentTest(qpid_interop_test.qit_common.QitTest):
#--- Main program start ---
if __name__ == '__main__':
- AMQP_LARGE_CONTENT_TEST = AmqpLargeContentTest()
- AMQP_LARGE_CONTENT_TEST.run_test()
- AMQP_LARGE_CONTENT_TEST.write_logs()
- if not AMQP_LARGE_CONTENT_TEST.get_result():
- sys.exit(1) # Errors or failures present
+ try:
+ AMQP_LARGE_CONTENT_TEST = AmqpLargeContentTest()
+ AMQP_LARGE_CONTENT_TEST.run_test()
+ AMQP_LARGE_CONTENT_TEST.write_logs()
+ if not AMQP_LARGE_CONTENT_TEST.get_result():
+ sys.exit(1) # Errors or failures present
+ except InteropTestError as err:
+ print(err)
+ sys.exit(1)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/amqp_types_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_types_test.py b/src/python/qpid_interop_test/amqp_types_test.py
index 38334df..5ab7f73 100755
--- a/src/python/qpid_interop_test/amqp_types_test.py
+++ b/src/python/qpid_interop_test/amqp_types_test.py
@@ -433,8 +433,12 @@ class AmqpTypesTest(qpid_interop_test.qit_common.QitTest):
#--- Main program start ---
if __name__ == '__main__':
- AMQP_TYPES_TEST = AmqpTypesTest()
- AMQP_TYPES_TEST.run_test()
- AMQP_TYPES_TEST.write_logs()
- if not AMQP_TYPES_TEST.get_result():
- sys.exit(1) # Errors or failures present
+ try:
+ AMQP_TYPES_TEST = AmqpTypesTest()
+ AMQP_TYPES_TEST.run_test()
+ AMQP_TYPES_TEST.write_logs()
+ if not AMQP_TYPES_TEST.get_result():
+ sys.exit(1) # Errors or failures present
+ except InteropTestError as err:
+ print(err)
+ sys.exit(1)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/broker_properties.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/broker_properties.py b/src/python/qpid_interop_test/broker_properties.py
index 734d490..ed0c35e 100644
--- a/src/python/qpid_interop_test/broker_properties.py
+++ b/src/python/qpid_interop_test/broker_properties.py
@@ -22,10 +22,11 @@ gets the broker connection properties so as to identify the broker.
# under the License.
#
-from proton.handlers import MessagingHandler
-from proton.reactor import Container
+import proton.handlers
+import proton.reactor
+from qpid_interop_test.interop_test_errors import InteropTestError
-class Client(MessagingHandler):
+class Client(proton.handlers.MessagingHandler):
"""
Client to connect to broker and collect connection properties, used to identify the test broker
"""
@@ -36,7 +37,7 @@ class Client(MessagingHandler):
def on_start(self, event):
"""Event loop start"""
- event.container.connect(url=self.url, sasl_enabled=False)
+ event.container.connect(url=self.url, sasl_enabled=False, reconnect=False)
def on_connection_remote_open(self, event):
"""Callback for remote connection open"""
@@ -47,9 +48,11 @@ class Client(MessagingHandler):
"""Return the connection properties"""
return self.remote_properties
+ def on_transport_error(self, event):
+ raise InteropTestError('ERROR: broker not found at %s' % self.url)
def get_broker_properties(broker_url):
"""Start client, then return its connection properties"""
msg_handler = Client(broker_url)
- Container(msg_handler).run()
+ proton.reactor.Container(msg_handler).run()
return msg_handler.get_connection_properties()
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/jms_hdrs_props_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_hdrs_props_test.py b/src/python/qpid_interop_test/jms_hdrs_props_test.py
index d83a546..a05e9bb 100755
--- a/src/python/qpid_interop_test/jms_hdrs_props_test.py
+++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py
@@ -658,8 +658,12 @@ class JmsHdrsPropsTest(qpid_interop_test.qit_common.QitJmsTest):
#--- Main program start ---
if __name__ == '__main__':
- JMS_MESSAGES_TEST = JmsHdrsPropsTest()
- JMS_MESSAGES_TEST.run_test()
- JMS_MESSAGES_TEST.write_logs()
- if not JMS_MESSAGES_TEST.get_result():
- sys.exit(1) # Errors or failures present
+ try:
+ JMS_MESSAGES_TEST = JmsHdrsPropsTest()
+ JMS_MESSAGES_TEST.run_test()
+ JMS_MESSAGES_TEST.write_logs()
+ if not JMS_MESSAGES_TEST.get_result():
+ sys.exit(1) # Errors or failures present
+ except InteropTestError as err:
+ print(err)
+ exit(1)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/jms_messages_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_messages_test.py b/src/python/qpid_interop_test/jms_messages_test.py
index 15f292c..e1f4e66 100755
--- a/src/python/qpid_interop_test/jms_messages_test.py
+++ b/src/python/qpid_interop_test/jms_messages_test.py
@@ -331,8 +331,12 @@ class JmsMessagesTest(qpid_interop_test.qit_common.QitJmsTest):
#--- Main program start ---
if __name__ == '__main__':
- JMS_MESSAGES_TEST = JmsMessagesTest()
- JMS_MESSAGES_TEST.run_test()
- JMS_MESSAGES_TEST.write_logs()
- if not JMS_MESSAGES_TEST.get_result():
- sys.exit(1) # Errors or failures present
+ try:
+ JMS_MESSAGES_TEST = JmsMessagesTest()
+ JMS_MESSAGES_TEST.run_test()
+ JMS_MESSAGES_TEST.write_logs()
+ if not JMS_MESSAGES_TEST.get_result():
+ sys.exit(1) # Errors or failures present
+ except InteropTestError as err:
+ print(err)
+ sys.exit(1)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/fb6f8541/src/python/qpid_interop_test/shims.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/shims.py b/src/python/qpid_interop_test/shims.py
index 0d369bb..948c218 100644
--- a/src/python/qpid_interop_test/shims.py
+++ b/src/python/qpid_interop_test/shims.py
@@ -75,13 +75,13 @@ class ShimProcess(subprocess.Popen):
class Sender(ShimProcess):
"""Sender shim process"""
def __init__(self, params, python3_flag, proc_name='Sender'):
- #print('\n>>>SNDR>>> %s python3_flag=%s' % (params, python3_flag))
+ print('\n>>>SNDR>>> %s python3_flag=%s' % (params, python3_flag))
super(Sender, self).__init__(params, python3_flag, proc_name)
class Receiver(ShimProcess):
"""Receiver shim process"""
def __init__(self, params, python3_flag, proc_name='Receiver'):
- #print('\n>>>RCVR>>> %s python3_flag=%s' % (params, python3_flag))
+ print('\n>>>RCVR>>> %s python3_flag=%s' % (params, python3_flag))
super(Receiver, self).__init__(params, python3_flag, proc_name)
class Shim(object):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org