commit 774f2564d084ed018f452ca60c4d7f612f0baa33
author Kim van der Riet <kpvdr@apache.org> Mon Jul 16 11:06:55 2018 -0400
committer Kim van der Riet <kpvdr@apache.org> Mon Jul 16 11:16:17 2018 -0400
tree 4f56590e874dd09596405466ddc22d0161603a5b
parent 0c128063ec46ffc7e64244f4487cdfa64ae15656

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

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 @@
         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)

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 @@
     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)