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/15 22:19:29 UTC
qpid-interop-test git commit: QPIDIT-61: Fixed error in
jms_hdrs_props_test Python Sender shim,
which contained an invalid import which was not changed to match the newly
refactored modules.
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 887d38686 -> e20ae3c8b
QPIDIT-61: Fixed error in jms_hdrs_props_test Python Sender shim, which contained an invalid import which was not changed to match the newly refactored modules.
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/e20ae3c8
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/e20ae3c8
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/e20ae3c8
Branch: refs/heads/master
Commit: e20ae3c8b29a0af816d55238beff688c2700d62d
Parents: 887d386
Author: Kim van der Riet <kv...@localhost.localdomain>
Authored: Thu Feb 15 17:19:17 2018 -0500
Committer: Kim van der Riet <kv...@localhost.localdomain>
Committed: Thu Feb 15 17:19:17 2018 -0500
----------------------------------------------------------------------
.../src/jms_hdrs_props_test/Sender.py | 26 ++++++++++----------
1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/e20ae3c8/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 9a05490..4100891 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
@@ -36,7 +36,7 @@ import proton.handlers
import proton.reactor
from qpid_interop_test.interop_test_errors import InteropTestError
from qpid_interop_test.jms_types import create_annotation
-from qpid_interop_test.test_type_map import TestTypeMap
+from qpid_interop_test.qit_common import QitTestTypeMap
import _compat
@@ -154,8 +154,8 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
(test_value, test_value_type))
return proton.Message(id=(self.sent+1),
content_type='application/octet-stream',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_bytesmessage(self, test_value_type, test_value, hdr_kwargs, hdr_annotations):
@@ -190,8 +190,8 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
body=body_bytes,
inferred=True,
content_type='application/octet-stream',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_BYTESMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_BYTESMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_mapmessage(self, test_value_type, test_value, name, hdr_kwargs, hdr_annotations):
@@ -222,8 +222,8 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
return proton.Message(id=(self.sent+1),
body={name: value},
inferred=False,
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_objectmessage(self, test_value, hdr_kwargs, hdr_annotations):
@@ -233,8 +233,8 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
body=java_binary,
inferred=True,
content_type='application/x-java-serialized-object',
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_MAPMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
@staticmethod
@@ -279,16 +279,16 @@ class JmsHdrsPropsTestSender(proton.handlers.MessagingHandler):
return proton.Message(id=(self.sent+1),
body=body_list,
inferred=True,
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_STREAMMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_STREAMMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _create_jms_textmessage(self, test_value_text, hdr_kwargs, hdr_annotations):
"""Create a JMS text message"""
return proton.Message(id=(self.sent+1),
body=_compat.unicode(test_value_text),
- annotations=TestTypeMap.merge_dicts(create_annotation('JMS_TEXTMESSAGE_TYPE'),
- hdr_annotations),
+ annotations=QitTestTypeMap.merge_dicts(create_annotation('JMS_TEXTMESSAGE_TYPE'),
+ hdr_annotations),
**hdr_kwargs)
def _get_jms_message_header_kwargs(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org