Repository: qpid-interop-test Updated Branches: refs/heads/master f17dac39f -> 62ff8f4c9
QPIDIT-43: Fix for previous checkin: Change in logic broke existing tests 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/62ff8f4c Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/62ff8f4c Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/62ff8f4c Branch: refs/heads/master Commit: 62ff8f4c953f04904ed8f5e4585205e254ab8aa8 Parents: f17dac3 Author: Kim van der Riet <kp...@apache.org> Authored: Tue Oct 18 15:29:19 2016 -0400 Committer: Kim van der Riet <kp...@apache.org> Committed: Tue Oct 18 15:29:19 2016 -0400 ---------------------------------------------------------------------- src/python/qpid_interop_test/amqp_types_test.py | 5 +++-- src/python/qpid_interop_test/jms_hdrs_props_test.py | 5 +++-- src/python/qpid_interop_test/jms_messages_test.py | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/62ff8f4c/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 b3095e7..b876619 100755 --- a/src/python/qpid_interop_test/amqp_types_test.py +++ b/src/python/qpid_interop_test/amqp_types_test.py @@ -286,8 +286,9 @@ class AmqpTypeTestCase(unittest.TestCase): # Process return string from sender send_obj = sender.get_return_object() if send_obj is not None: - if isinstance(send_obj, str) and len(send_obj) > 0: - self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) + if isinstance(send_obj, str): + if len(send_obj) > 0: + self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) else: self.fail('Sender error: %s' % str(send_obj)) http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/62ff8f4c/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 1edb054..7c132c3 100755 --- a/src/python/qpid_interop_test/jms_hdrs_props_test.py +++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py @@ -273,8 +273,9 @@ class JmsMessageHdrsPropsTestCase(unittest.TestCase): # Process return string from sender send_obj = sender.get_return_object() if send_obj is not None: - if isinstance(send_obj, str) and len(send_obj) > 0: - self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) + if isinstance(send_obj, str): + if len(send_obj) > 0: + self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) else: self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, str(send_obj))) http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/62ff8f4c/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 8de22b2..e7f230b 100755 --- a/src/python/qpid_interop_test/jms_messages_test.py +++ b/src/python/qpid_interop_test/jms_messages_test.py @@ -228,8 +228,9 @@ class JmsMessageTypeTestCase(unittest.TestCase): # Process return string from sender send_obj = sender.get_return_object() if send_obj is not None: - if isinstance(send_obj, str) and len(send_obj) > 0: - self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) + if isinstance(send_obj, str): + if len(send_obj) > 0: + self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, send_obj)) else: self.fail('Send shim \'%s\':\n%s' % (send_shim.NAME, str(send_obj))) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
