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/07/16 15:07:18 UTC
qpid-interop-test git commit: 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.
Repository: qpid-interop-test
Updated Branches:
refs/heads/0.2.0 4a76b6c6d -> 4117ea507
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.
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/4117ea50
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/4117ea50
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/4117ea50
Branch: refs/heads/0.2.0
Commit: 4117ea5073a956f67840b2858530cbe4f90c4f94
Parents: 4a76b6c
Author: Kim van der Riet <kp...@apache.org>
Authored: Mon Jul 16 11:06:55 2018 -0400
Committer: Kim van der Riet <kp...@apache.org>
Committed: Mon Jul 16 11:06:55 2018 -0400
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/4117ea50/src/python/qpid_interop_test/qit_common.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/qit_common.py b/src/python/qpid_interop_test/qit_common.py
index d6939d4..6091a33 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)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/4117ea50/src/python/qpid_interop_test/qit_shim.py
----------------------------------------------------------------------
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