qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kp...@apache.org
Subject qpid-interop-test git commit: QPIDIT-112: Changed queue name prefix for all tests from "jms.queue.qpid_interop" to "qit". QPIDIT-109: Additional Python 3 compatibility issue found and fixed related to use of ord().
Date Thu, 01 Feb 2018 20:15:25 GMT
Repository: qpid-interop-test
Updated Branches:
  refs/heads/master f93886f54 -> 77efd7582


QPIDIT-112: Changed queue name prefix for all tests from "jms.queue.qpid_interop" to "qit".
QPIDIT-109: Additional Python 3 compatibility issue found and fixed related to use of ord().


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/77efd758
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/77efd758
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/77efd758

Branch: refs/heads/master
Commit: 77efd7582b512dfe450c50568b1fdc5b3bca2a68
Parents: f93886f
Author: Kim van der Riet <kvdr@localhost.localdomain>
Authored: Thu Feb 1 15:15:03 2018 -0500
Committer: Kim van der Riet <kvdr@localhost.localdomain>
Committed: Thu Feb 1 15:15:03 2018 -0500

----------------------------------------------------------------------
 shims/qpid-proton-python/src/_compat.py                  | 4 ++++
 shims/qpid-proton-python/src/amqp_types_test/Receiver.py | 5 +++--
 src/python/qpid_interop_test/amqp_large_content_test.py  | 2 +-
 src/python/qpid_interop_test/amqp_types_test.py          | 2 +-
 src/python/qpid_interop_test/jms_hdrs_props_test.py      | 2 +-
 src/python/qpid_interop_test/jms_messages_test.py        | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/shims/qpid-proton-python/src/_compat.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/_compat.py b/shims/qpid-proton-python/src/_compat.py
index 7f39e9a..3e772c8 100644
--- a/shims/qpid-proton-python/src/_compat.py
+++ b/shims/qpid-proton-python/src/_compat.py
@@ -35,6 +35,8 @@ if IS_PY3:
         return string.ascii_letters
     def long(i, r):
         return int(i, r)
+    def byte_char_ord(c):
+        return c
     def unichr(i):
         return chr(i)
     def unicode(i):
@@ -49,6 +51,8 @@ else:
         return string.letters
     def long(i, r):
         return __builtin__.long(i, r)
+    def byte_char_ord(c):
+        return __builtin__.ord(c)
     def unichr(i):
         return __builtin__.unichr(i)
     def unicode(i):

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/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 519033d..82c4c95 100755
--- a/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
+++ b/shims/qpid-proton-python/src/amqp_types_test/Receiver.py
@@ -97,10 +97,11 @@ class AmqpTypesTestReceiver(proton.handlers.MessagingHandler):
             elif self.amqp_type == 'decimal64':
                 self.received_value_list.append('0x%016x' % event.message.body)
             elif self.amqp_type == 'decimal128':
-                self.received_value_list.append('0x' + ''.join(['%02x' % ord(c) for c in
event.message.body]).strip())
+                self.received_value_list.append('0x' + ''.join(['%02x' % _compat.byte_char_ord(c)
\
+                                                                for c in event.message.body]).strip())
             elif self.amqp_type == 'char':
                 if ord(event.message.body) < 0x80 and event.message.body in \
-                   string.digits + _compat.letters + string.punctuation + " ":
+                   string.digits + _compat.letters() + string.punctuation + ' ':
                     self.received_value_list.append(event.message.body)
                 else:
                     self.received_value_list.append(hex(ord(event.message.body)))

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/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 f6a5f94..ec5ab7e 100755
--- a/src/python/qpid_interop_test/amqp_large_content_test.py
+++ b/src/python/qpid_interop_test/amqp_large_content_test.py
@@ -84,7 +84,7 @@ class AmqpLargeContentTestCase(qpid_interop_test.qit_common.QitTestCase):
             # Currently, Artemis only supports auto-create queues for JMS, and the queue
name must be prefixed by
             # 'jms.queue.'
             #queue_name = 'qpid-interop.simple_type_tests.%s.%s.%s' % (amqp_type, send_shim.NAME,
receive_shim.NAME)
-            queue_name = 'jms.queue.qpid-interop.amqp_large_content_test.%s.%s.%s' % \
+            queue_name = 'qit.amqp_large_content_test.%s.%s.%s' % \
                          (amqp_type, send_shim.NAME, receive_shim.NAME)
 
             # Start the receive shim first (for queueless brokers/dispatch)

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/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 8fe6cd8..8a43cf6 100755
--- a/src/python/qpid_interop_test/amqp_types_test.py
+++ b/src/python/qpid_interop_test/amqp_types_test.py
@@ -316,7 +316,7 @@ class AmqpTypeTestCase(qpid_interop_test.qit_common.QitTestCase):
             # TODO: When Artemis can support it (in the next release), revert the queue name
back to 'qpid-interop...'
             # Currently, Artemis only supports auto-create queues for JMS, and the queue
name must be prefixed by
             # 'jms.queue.'
-            queue_name = 'jms.queue.qpid-interop.%s' % test_name
+            queue_name = 'qit.%s' % test_name
 
             # Start the receive shim first (for queueless brokers/dispatch)
             receiver = receive_shim.create_receiver(receiver_addr, queue_name, amqp_type,
str(len(test_value_list)))

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/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 ea5dfd6..6216e2f 100755
--- a/src/python/qpid_interop_test/jms_hdrs_props_test.py
+++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py
@@ -277,7 +277,7 @@ class JmsMessageHdrsPropsTestCase(qpid_interop_test.qit_common.QitTestCase):
         Run this test by invoking the shim send method to send the test values, followed
by the shim receive method
         to receive the values. Finally, compare the sent values with the received values.
         """
-        queue_name = 'jms.queue.qpid-interop.jms_message_hdrs_props_tests.%s' % queue_name_fragment
+        queue_name = 'qit.jms_hdrs_props_test.%s' % queue_name_fragment
 
         # First create a map containing the numbers of expected mesasges for each JMS message
type
         num_test_values_map = {}

http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/77efd758/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 9dc29b9..60dfde0 100755
--- a/src/python/qpid_interop_test/jms_messages_test.py
+++ b/src/python/qpid_interop_test/jms_messages_test.py
@@ -199,7 +199,7 @@ class JmsMessageTypeTestCase(qpid_interop_test.qit_common.QitTestCase):
         Run this test by invoking the shim send method to send the test values, followed
by the shim receive method
         to receive the values. Finally, compare the sent values with the received values.
         """
-        queue_name = 'jms.queue.qpid-interop.jms_message_type_tests.%s.%s.%s' % (jms_message_type,
send_shim.NAME,
+        queue_name = 'qit.jms_messages_test.%s.%s.%s' % (jms_message_type, send_shim.NAME,
                                                                                  receive_shim.NAME)
 
         # First create a map containing the numbers of expected mesasges for each JMS message
type


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message