You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by cm...@apache.org on 2021/03/31 00:06:44 UTC
[qpid-interop-test] 15/41: QPIDIT-128: Changed construction of
JAVA_HOME to be compliant with Java norms,
also added warning when shim jar file is not found at start of JMS tests.
This is an automated email from the ASF dual-hosted git repository.
cml pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
commit 774f2564d084ed018f452ca60c4d7f612f0baa33
Author: Kim van der Riet <kp...@apache.org>
AuthorDate: Mon Jul 16 11:06:55 2018 -0400
QPIDIT-128: Changed construction of JAVA_HOME to be compliant with Java norms, also added warning when shim jar file is not found at start of JMS tests.
---
src/python/qpid_interop_test/qit_common.py | 2 ++
src/python/qpid_interop_test/qit_shim.py | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/python/qpid_interop_test/qit_common.py b/src/python/qpid_interop_test/qit_common.py
index 8131237..94f5fcc 100644
--- a/src/python/qpid_interop_test/qit_common.py
+++ b/src/python/qpid_interop_test/qit_common.py
@@ -418,6 +418,8 @@ class QitJmsTest(QitTest):
else:
classpath = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms',
'qpid-interop-test-jms-shim-%s-jar-with-dependencies.jar' % QPID_JMS_SHIM_VER)
+ if not path.isfile(classpath):
+ print('WARNING: Jar not found: %s' % classpath)
self.shim_map[qpid_interop_test.qit_shim.QpidJmsShim.NAME] = \
qpid_interop_test.qit_shim.QpidJmsShim(classpath, qpid_jms_snd_shim, qpid_jms_rcv_shim)
diff --git a/src/python/qpid_interop_test/qit_shim.py b/src/python/qpid_interop_test/qit_shim.py
index fe9aafd..916337a 100644
--- a/src/python/qpid_interop_test/qit_shim.py
+++ b/src/python/qpid_interop_test/qit_shim.py
@@ -156,8 +156,8 @@ class QpidJmsShim(Shim):
NAME = 'QpidJms'
JMS_CLIENT = True
- JAVA_HOME = os.getenv('JAVA_HOME', '/usr/bin') # Default only works in Linux
- JAVA_EXEC = os.path.join(JAVA_HOME, 'java')
+ JAVA_HOME = os.getenv('JAVA_HOME', '/usr')
+ JAVA_EXEC = os.path.join(JAVA_HOME, 'bin', 'java')
def __init__(self, dependency_class_path, sender_shim, receiver_shim):
super(QpidJmsShim, self).__init__(sender_shim, receiver_shim)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org