QPIDIT-83: change classpath to look at installed directory, QPIDIT-80: Disable option --include-type option in jms_hdrs_props_test
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 0424451..139b5ae 100755
--- a/src/python/qpid_interop_test/jms_hdrs_props_test.py
+++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py
@@ -43,7 +43,6 @@
print 'ERROR: Environment variable QIT_INSTALL_PREFIX is not set'
sys.exit(1)
QIT_TEST_SHIM_HOME = path.join(QIT_INSTALL_PREFIX, 'libexec', 'qpid_interop_test', 'shims')
-MAVEN_REPO_PATH = getenv('MAVEN_REPO_PATH', path.join(getenv('HOME'), '.m2', 'repository'))
class JmsMessageTypes(TestTypeMap):
"""
@@ -605,12 +604,14 @@
parser.add_argument('--broker-type', action='store', metavar='BROKER_NAME',
help='Disable test of broker type (using connection properties) by specifying the broker' +
' name, or "None".')
- type_group = parser.add_mutually_exclusive_group()
- type_group.add_argument('--include-type', action='append', metavar='JMS_MESSAGE-TYPE',
- help='Name of AMQP type to include. Supported types:\n%s' %
- sorted(JmsMessageTypes.TYPE_MAP.keys()))
- type_group.add_argument('--exclude-type', action='append', metavar='JMS_MESSAGE-TYPE',
- help='Name of AMQP type to exclude. Supported types: see "include-type" above')
+ # TODO: This test only uses JMS_MESSAGE_TYPE. It should be possible to set the type used, but if these
+ # options are used, it errors. [QPIDIT-80]
+ #type_group = parser.add_mutually_exclusive_group()
+ #type_group.add_argument('--include-type', action='append', metavar='JMS_MESSAGE-TYPE',
+ # help='Name of AMQP type to include. Supported types:\n%s' %
+ # sorted(JmsMessageTypes.TYPE_MAP.keys()))
+ #type_group.add_argument('--exclude-type', action='append', metavar='JMS_MESSAGE-TYPE',
+ # help='Name of AMQP type to exclude. Supported types: see "include-type" above')
shim_group = parser.add_mutually_exclusive_group()
shim_group.add_argument('--include-shim', action='append', metavar='SHIM-NAME',
help='Name of shim to include. Supported shims:\n%s' % sorted(shim_map.keys()))
@@ -629,8 +630,11 @@
'Receiver.py')
PROTON_PYTHON_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'jms_hdrs_props_test', 'Sender.py')
QIT_JMS_CLASSPATH_FILE = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms', 'cp.txt')
- with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
- QIT_JMS_CLASSPATH = classpath_file.read()
+ if path.isfile(QIT_JMS_CLASSPATH_FILE):
+ with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
+ QIT_JMS_CLASSPATH = classpath_file.read()
+ else:
+ QIT_JMS_CLASSPATH = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms', '*')
QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_hdrs_props_test.Receiver'
QPID_JMS_SENDER_SHIM = 'org.apache.qpid.interop_test.jms_hdrs_props_test.Sender'
diff --git a/src/python/qpid_interop_test/jms_messages_test.py b/src/python/qpid_interop_test/jms_messages_test.py
index 2e22267..3b54510 100755
--- a/src/python/qpid_interop_test/jms_messages_test.py
+++ b/src/python/qpid_interop_test/jms_messages_test.py
@@ -43,7 +43,6 @@
print 'ERROR: Environment variable QIT_INSTALL_PREFIX is not set'
sys.exit(1)
QIT_TEST_SHIM_HOME = path.join(QIT_INSTALL_PREFIX, 'libexec', 'qpid_interop_test', 'shims')
-MAVEN_REPO_PATH = getenv('MAVEN_REPO_PATH', path.join(getenv('HOME'), '.m2', 'repository'))
class JmsMessageTypes(TestTypeMap):
"""
@@ -316,10 +315,10 @@
' name, or "None".')
type_group = parser.add_mutually_exclusive_group()
type_group.add_argument('--include-type', action='append', metavar='JMS_MESSAGE-TYPE',
- help='Name of AMQP type to include. Supported types:\n%s' %
+ help='Name of JMS message type to include. Supported types:\n%s' %
sorted(JmsMessageTypes.TYPE_MAP.keys()))
type_group.add_argument('--exclude-type', action='append', metavar='JMS_MESSAGE-TYPE',
- help='Name of AMQP type to exclude. Supported types: see "include-type" above')
+ help='Name of JMS message type to exclude. Supported types: see "include-type" above')
shim_group = parser.add_mutually_exclusive_group()
shim_group.add_argument('--include-shim', action='append', metavar='SHIM-NAME',
help='Name of shim to include. Supported shims:\n%s' % sorted(shim_map.keys()))
@@ -337,8 +336,11 @@
PROTON_PYTHON_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'jms_messages_test', 'Receiver.py')
PROTON_PYTHON_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'jms_messages_test', 'Sender.py')
QIT_JMS_CLASSPATH_FILE = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms', 'cp.txt')
- with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
- QIT_JMS_CLASSPATH = classpath_file.read()
+ if path.isfile(QIT_JMS_CLASSPATH_FILE):
+ with open(QIT_JMS_CLASSPATH_FILE, 'r') as classpath_file:
+ QIT_JMS_CLASSPATH = classpath_file.read()
+ else:
+ QIT_JMS_CLASSPATH = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms', '*')
QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_messages_test.Receiver'
QPID_JMS_SENDER_SHIM = 'org.apache.qpid.interop_test.jms_messages_test.Sender'
diff --git a/src/python/qpid_interop_test/test_type_map.py b/src/python/qpid_interop_test/test_type_map.py
index 3d0bc65..3e5367d 100644
--- a/src/python/qpid_interop_test/test_type_map.py
+++ b/src/python/qpid_interop_test/test_type_map.py
@@ -62,7 +62,7 @@
return self.TYPE_MAP.keys()
def get_types(self, args):
- if args.include_type is not None:
+ if "include_type" in args and args.include_type is not None:
new_type_map = {}
for type in args.include_type:
try:
@@ -71,7 +71,7 @@
print 'No such type: "%s". Use --help for valid types' % type
sys.exit(1) # Errors or failures present
self.TYPE_MAP = new_type_map
- if args.exclude_type is not None:
+ if "exclude_type" in args and args.exclude_type is not None:
for type in args.exclude_type:
try:
self.TYPE_MAP.pop(type)
