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 2021/09/22 17:32:54 UTC
[qpid-interop-test] branch main updated: Changed installation so
that tests can be run as binaries from the bin dir,
and QIT is not installed as a Python library.
This is an automated email from the ASF dual-hosted git repository.
kpvdr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-interop-test.git
The following commit(s) were added to refs/heads/main by this push:
new 2895206 Changed installation so that tests can be run as binaries from the bin dir, and QIT is not installed as a Python library.
2895206 is described below
commit 2895206ecc78a8951fc0cad7d19447e570b353b2
Author: Kim van der Riet <ki...@apache.org>
AuthorDate: Wed Sep 22 13:32:39 2021 -0400
Changed installation so that tests can be run as binaries from the bin dir, and QIT is not installed as a Python library.
---
CMakeLists.txt | 74 +++++++----------------------
bin/amqp_complex_types_test | 3 ++
bin/amqp_large_content_test | 3 ++
bin/amqp_types_test | 3 ++
bin/jms_hdrs_props_test | 3 ++
bin/jms_messages_test | 3 ++
config.sh.in | 19 ++------
get-python-dir-name | 29 -----------
setup.py | 65 -------------------------
shims/qpid-proton-python/CMakeLists.txt | 38 +++++++++++++++
shims/qpid-proton-python/src/CMakeLists.txt | 22 ---------
src/python/qpid_interop_test/qit_common.py | 56 +++++++++++-----------
12 files changed, 103 insertions(+), 215 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4f38741..faa4769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,56 +24,17 @@ cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
set (ErrorFlag FALSE)
# Find Python
-# Older cmakes (2.8.x used on RHEL/CentOS 7) don't do Python2
-# vs Python3 cleanly. So we must improvise...
-MACRO (find_python
- py_exec # Python executable (eg python, python3)
- found_var_name # Variable name indicating python executable found
- version_var_name # Variable name containing python version
- site_dir_var_name) # Variable name containing site_packages dir name
- execute_process (COMMAND ${py_exec} --version
- RESULT_VARIABLE res
- OUTPUT_VARIABLE ov
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_VARIABLE ev
- ERROR_STRIP_TRAILING_WHITESPACE)
- if (res STREQUAL "0")
- set (${found_var_name} ON)
- # Some versions of Python print version info to stdout, others to stderr
- if (ov STREQUAL "")
- if (ev STREQUAL "")
- message (WARNING "Unable to obtain python version string")
- else ()
- set(ov ${ev})
- endif ()
- endif ()
- message (STATUS "${ov} found")
- string (REGEX MATCH "[0-9]+(\\.[0-9]+)" ver_str "${ov}")
- set (${version_var_name} ${ver_str})
- string (REGEX MATCH "[0-9]+" maj_ver_str ${ver_str})
- execute_process (COMMAND ${CMAKE_SOURCE_DIR}/get-python-dir-name ${maj_ver_str}
- OUTPUT_VARIABLE dir_name)
- set (${site_dir_var_name} ${dir_name})
- else ()
- message (STATUS "${py_exec} not found")
- set (${found_var_name} ${py_exec}-NOTFOUND)
- endif ()
-ENDMACRO ()
-
-#find_python(python2 "PYTHON2_FOUND" "PYTHON2_VER" "PYTHON2_SITE_DIR_NAME")
-# Python2 is required to run main QIT program
-#if (NOT PYTHON2_FOUND)
-# message(STATUS "ERROR: Python 2.x not found, but is required")
-# set (ErrorFlag TRUE)
-#endif ()
-find_python(python3 "PYTHON3_FOUND" "PYTHON3_VER" "PYTHON3_SITE_DIR_NAME")
+find_package (Python 3 COMPONENTS Interpreter Development)
+if (NOT Python_FOUND)
+ message (STATUS "ERROR: Python 3 not found, but is required")
+ set (ErrorFlag TRUE)
+endif ()
# Find Java 11
find_package(Java 11 COMPONENTS Development)
-# if (NOT Java_FOUND)
-# RHEL7 bug: Java_FOUND is not being set, so workaround:
-if (NOT DEFINED Java_JAVA_EXECUTABLE OR NOT DEFINED Java_JAVAC_EXECUTABLE OR NOT DEFINED Java_JAR_EXECUTABLE)
- message(STATUS "ERROR: Java compiler not found, but is required")
+if (NOT Java_FOUND)
+#if (NOT DEFINED Java_JAVA_EXECUTABLE OR NOT DEFINED Java_JAVAC_EXECUTABLE OR NOT DEFINED Java_JAR_EXECUTABLE)
+ message(STATUS "ERROR: Java 11 compiler not found, but is required")
set (ErrorFlag TRUE)
endif ()
@@ -90,7 +51,7 @@ endif ()
# Find Proton components
-find_package(Proton 0.30)
+find_package(Proton 0.35)
if (Proton_FOUND)
get_filename_component(PROTON_INSTALL_DIR ${Proton_INCLUDE_DIRS} PATH CACHE PATH "Proton install directory")
message(STATUS "Qpid proton found. Version ${Proton_VERSION} at ${Proton_INCLUDE_DIRS}")
@@ -99,7 +60,7 @@ else ()
set (ErrorFlag TRUE)
endif ()
-find_package(ProtonCpp 0.30)
+find_package(ProtonCpp 0.35)
if (ProtonCpp_FOUND)
get_filename_component(PROTON_CPP_INSTALL_DIR ${ProtonCpp_INCLUDE_DIRS} PATH CACHE PATH "ProtonCpp install directory")
message(STATUS "Qpid proton c++ binding found. Version ${ProtonCpp_VERSION} at ${ProtonCpp_INCLUDE_DIRS}")
@@ -112,6 +73,7 @@ if (ErrorFlag)
message(FATAL_ERROR "Required component(s) missing, aborting configuration. See above for errors.")
endif ()
+add_subdirectory(shims/qpid-proton-python)
add_subdirectory(shims/qpid-proton-cpp/src)
add_subdirectory(shims/qpid-jms)
add_subdirectory(shims/amqpnetlite/src)
@@ -153,12 +115,12 @@ endif()
configure_file(config.sh.in config.sh @ONLY)
-# Install files using python setup.py
-#install(CODE "MESSAGE(STATUS \"Python 2 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON2_SITE_DIR_NAME}/site-packages/qpid_interop_test/\")")
-#install(CODE "execute_process(COMMAND python2 setup.py install --prefix ${CMAKE_INSTALL_PREFIX}
-# WORKING_DIRECTORY ../)")
-install(CODE "MESSAGE(STATUS \"Python 3 install dir: ${CMAKE_INSTALL_PREFIX}/lib/${PYTHON3_SITE_DIR_NAME}/site-packages/qpid_interop_test/\")")
-install(CODE "execute_process(COMMAND python3 setup.py install --prefix ${CMAKE_INSTALL_PREFIX}
- WORKING_DIRECTORY ../)")
+install (DIRECTORY src/python/qpid_interop_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}
+ PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY bin
+ DESTINATION ${CMAKE_INSTALL_PREFIX}
+ FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ
+ PATTERN ".gitignore" EXCLUDE)
install(FILES build/config.sh
DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/)
diff --git a/bin/amqp_complex_types_test b/bin/amqp_complex_types_test
new file mode 100755
index 0000000..2c35a7e
--- /dev/null
+++ b/bin/amqp_complex_types_test
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+python3 -m qpid_interop_test.amqp_complex_types_test $@
diff --git a/bin/amqp_large_content_test b/bin/amqp_large_content_test
new file mode 100755
index 0000000..9eae769
--- /dev/null
+++ b/bin/amqp_large_content_test
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+python3 -m qpid_interop_test.amqp_large_content_test $@
diff --git a/bin/amqp_types_test b/bin/amqp_types_test
new file mode 100755
index 0000000..1a9ca41
--- /dev/null
+++ b/bin/amqp_types_test
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+python3 -m qpid_interop_test.amqp_types_test $@
diff --git a/bin/jms_hdrs_props_test b/bin/jms_hdrs_props_test
new file mode 100755
index 0000000..ca0a7c1
--- /dev/null
+++ b/bin/jms_hdrs_props_test
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+python3 -m qpid_interop_test.jms_hdrs_props_test $@
diff --git a/bin/jms_messages_test b/bin/jms_messages_test
new file mode 100755
index 0000000..73afbe7
--- /dev/null
+++ b/bin/jms_messages_test
@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+python3 -m qpid_interop_test.jms_messages_test $@
diff --git a/config.sh.in b/config.sh.in
index 2c335bf..0fbe426 100644
--- a/config.sh.in
+++ b/config.sh.in
@@ -18,19 +18,8 @@
# Source this file to set up environment variables for the Qpid interop tests.
-export QIT_INSTALL_PREFIX=@CMAKE_INSTALL_PREFIX@
+export PYTHON3PATH=@PROTON_INSTALL_DIR@/lib64/proton/bindings/python:@CMAKE_INSTALL_PREFIX@:@CMAKE_INSTALL_PREFIX@/libexec/qpid_interop_test/shims/qpid-proton-python
+export PYTHONPATH=${PYTHON3PATH}
-# Set PYTHON3PATH for respective python shims
-
-unset PYTHON3PATH
-py3_found_str="@PYTHON3_FOUND@"
-if [[ "${py3_found_str#*-}" == "NOTFOUND" ]]; then
- echo "No Python 3.x found, Python 3 shims disabled"
-else
- export PYTHON3PATH=@CMAKE_INSTALL_PREFIX@/lib64/proton/bindings/python:@CMAKE_INSTALL_PREFIX@/lib/@PYTHON3_SITE_DIR_NAME@/site-packages:@CMAKE_INSTALL_PREFIX@/libexec/qpid_interop_test/shims/qpid-proton-python
-fi
-# To run the main program use python 3
-export PYTHONPATH=$PYTHON3PATH
-
-export LD_LIBRARY_PATH=@CMAKE_INSTALL_PREFIX@/lib64:$LD_LIBRARY_PATH
-export PATH=@CMAKE_INSTALL_PREFIX@/lib/@PYTHON_DIR_NAME@/site-packages/qpid_interop_test:$PATH
+export LD_LIBRARY_PATH=@PROTON_INSTALL_DIR@/lib64:${LD_LIBRARY_PATH}
+export PATH=@PROTON_INSTALL_DIR@/bin:@CMAKE_INSTALL_PREFIX@/bin:${PATH}
diff --git a/get-python-dir-name b/get-python-dir-name
deleted file mode 100755
index 8d971d8..0000000
--- a/get-python-dir-name
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# $1: Python major version, either 2 or 3
-
-if [[ $# != 1 ]]; then
- echo "Python major ver required as parameter"
- exit 1
-fi
-PYTHON_DIR=`ls -d /usr/lib/python${1}* 2> /dev/null`
-if [[ $? == 0 ]]; then
- echo -n ${PYTHON_DIR##*/}
-else
- echo -n "NOT_FOUND"
-fi
diff --git a/setup.py b/setup.py
deleted file mode 100644
index b4e1308..0000000
--- a/setup.py
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/usr/bin/env python
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-from distutils.core import setup
-
-LIBEXEC_DIR = 'libexec/qpid_interop_test'
-SHIM_DIR = '%s/shims' % LIBEXEC_DIR
-
-setup(name='qpid-interop-test',
- version='0.2',
- description='Test suite for testing interoperability between Qpid AMQP clients',
- author='Apache Qpid',
- author_email='users@qpid.apache.org',
- url='http://qpid.apache.org/',
- packages=['qpid_interop_test'],
- package_dir={'qpid_interop_test': 'src/python/qpid_interop_test'},
-
- # Shims, installed into {INSTALL_PREFIX}/libexec/qpid_interop_test/shims/
- data_files=[ ('%s/qpid-proton-python/amqp_types_test' % SHIM_DIR,
- ['shims/qpid-proton-python/src/amqp_types_test/Receiver.py',
- 'shims/qpid-proton-python/src/amqp_types_test/Sender.py',
- ]
- ),
- ('%s/qpid-proton-python/amqp_complex_types_test' % SHIM_DIR,
- ['shims/qpid-proton-python/src/amqp_complex_types_test/__init__.py',
- 'shims/qpid-proton-python/src/amqp_complex_types_test/amqp_complex_types_test_data.py',
- 'shims/qpid-proton-python/src/amqp_complex_types_test/Common.py',
- 'shims/qpid-proton-python/src/amqp_complex_types_test/Receiver.py',
- 'shims/qpid-proton-python/src/amqp_complex_types_test/Sender.py',
- ]
- ),
- ('%s/qpid-proton-python/amqp_large_content_test' % SHIM_DIR,
- ['shims/qpid-proton-python/src/amqp_large_content_test/Receiver.py',
- 'shims/qpid-proton-python/src/amqp_large_content_test/Sender.py',
- ]
- ),
- ('%s/qpid-proton-python/jms_hdrs_props_test' % SHIM_DIR,
- ['shims/qpid-proton-python/src/jms_hdrs_props_test/Receiver.py',
- 'shims/qpid-proton-python/src/jms_hdrs_props_test/Sender.py',
- ]
- ),
- ('%s/qpid-proton-python/jms_messages_test' % SHIM_DIR,
- ['shims/qpid-proton-python/src/jms_messages_test/Receiver.py',
- 'shims/qpid-proton-python/src/jms_messages_test/Sender.py',
- ]
- ),
- ],
- )
diff --git a/shims/qpid-proton-python/CMakeLists.txt b/shims/qpid-proton-python/CMakeLists.txt
new file mode 100644
index 0000000..f150a41
--- /dev/null
+++ b/shims/qpid-proton-python/CMakeLists.txt
@@ -0,0 +1,38 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+project (qpid-interop-test-python-shim)
+
+cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
+
+install (DIRECTORY src/amqp_complex_types_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-proton-python
+ PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY src/amqp_large_content_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-proton-python
+ PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY src/amqp_types_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-proton-python
+ PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY src/jms_hdrs_props_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-proton-python
+ PATTERN ".gitignore" EXCLUDE)
+install (DIRECTORY src/jms_messages_test
+ DESTINATION ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/qpid-proton-python
+ PATTERN ".gitignore" EXCLUDE)
diff --git a/shims/qpid-proton-python/src/CMakeLists.txt b/shims/qpid-proton-python/src/CMakeLists.txt
deleted file mode 100644
index 3f2c9a2..0000000
--- a/shims/qpid-proton-python/src/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-project (qpid-interop-test-python-shim)
-
-cmake_minimum_required(VERSION 3.16.3 FATAL_ERROR)
diff --git a/src/python/qpid_interop_test/qit_common.py b/src/python/qpid_interop_test/qit_common.py
index c12e118..724f508 100644
--- a/src/python/qpid_interop_test/qit_common.py
+++ b/src/python/qpid_interop_test/qit_common.py
@@ -22,7 +22,7 @@ Module containing common classes
#
import argparse
-from os import getenv, path
+import os
import sys
import time
import unittest
@@ -32,16 +32,19 @@ import qpid_interop_test.qit_broker_props
import qpid_interop_test.qit_shim
import qpid_interop_test.qit_xunit_log
-# TODO: propose a sensible default when installation details are worked out
-QIT_INSTALL_PREFIX = getenv('QIT_INSTALL_PREFIX')
-if QIT_INSTALL_PREFIX is None:
- print('ERROR: Environment variable QIT_INSTALL_PREFIX is not set')
- sys.exit(1)
-QIT_ENABLE_PYTHON3_SHIM = getenv('PYTHON3PATH') is not None
-QIT_TEST_SHIM_HOME = path.join(QIT_INSTALL_PREFIX, 'libexec', 'qpid_interop_test', 'shims')
-
QPID_JMS_SHIM_VER = '0.3.0-SNAPSHOT'
+# Find shim directory
+PREFIX_LIST = [os.path.join(os.sep, 'usr', 'local')]
+if 'PYTHONPATH' in os.environ:
+ PREFIX_LIST.extend(os.getenv('PYTHONPATH').split(':'))
+for prefix in PREFIX_LIST:
+ if os.path.exists(os.path.join(prefix, 'libexec', 'qpid_interop_test')):
+ QIT_SHIM_HOME = os.path.join(prefix, 'libexec', 'qpid_interop_test', 'shims')
+ break
+if QIT_SHIM_HOME is None:
+ print(f'Unable to locate shims in {PREFIX_LIST}.')
+ sys.exit(1)
class QitTestTypeMap:
"""
@@ -314,35 +317,32 @@ class QitTest:
def _create_shim_map(self):
"""Create a shim map {'shim_name': <shim_instance>}"""
# Proton C++ shim
- proton_cpp_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', self.TEST_NAME, 'Receiver')
- proton_cpp_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', self.TEST_NAME, 'Sender')
+ proton_cpp_rcv_shim = os.path.join(QIT_SHIM_HOME, 'qpid-proton-cpp', self.TEST_NAME, 'Receiver')
+ proton_cpp_snd_shim = os.path.join(QIT_SHIM_HOME, 'qpid-proton-cpp', self.TEST_NAME, 'Sender')
self.shim_map = {qpid_interop_test.qit_shim.ProtonCppShim.NAME: \
qpid_interop_test.qit_shim.ProtonCppShim(proton_cpp_snd_shim, proton_cpp_rcv_shim),
}
# Python shims
- proton_python_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', self.TEST_NAME, 'Receiver.py')
- proton_python_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', self.TEST_NAME, 'Sender.py')
- if QIT_ENABLE_PYTHON3_SHIM:
- self.shim_map[qpid_interop_test.qit_shim.ProtonPython3Shim.NAME] = \
- qpid_interop_test.qit_shim.ProtonPython3Shim(proton_python_snd_shim, proton_python_rcv_shim)
- else:
- print('Python 3 shim disabled: no PYTHON3PATH in environment')
+ proton_python_rcv_shim = os.path.join(QIT_SHIM_HOME, 'qpid-proton-python', self.TEST_NAME, 'Receiver.py')
+ proton_python_snd_shim = os.path.join(QIT_SHIM_HOME, 'qpid-proton-python', self.TEST_NAME, 'Sender.py')
+ self.shim_map[qpid_interop_test.qit_shim.ProtonPython3Shim.NAME] = \
+ qpid_interop_test.qit_shim.ProtonPython3Shim(proton_python_snd_shim, proton_python_rcv_shim)
# Add shims that need detection during installation only if the necessary bits are present
# Rhea Javascript client
- rhea_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'rhea-js', self.TEST_NAME, 'Receiver.js')
- rhea_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'rhea-js', self.TEST_NAME, 'Sender.js')
- if path.isfile(rhea_rcv_shim) and path.isfile(rhea_snd_shim):
+ rhea_rcv_shim = os.path.join(QIT_SHIM_HOME, 'rhea-js', self.TEST_NAME, 'Receiver.js')
+ rhea_snd_shim = os.path.join(QIT_SHIM_HOME, 'rhea-js', self.TEST_NAME, 'Sender.js')
+ if os.path.isfile(rhea_rcv_shim) and os.path.isfile(rhea_snd_shim):
self.shim_map[qpid_interop_test.qit_shim.RheaJsShim.NAME] = \
qpid_interop_test.qit_shim.RheaJsShim(rhea_snd_shim, rhea_rcv_shim)
else:
print('WARNING: Rhea Javascript shims not found')
# AMQP DotNetLite client
- amqpnetlite_rcv_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite', self.TEST_NAME, 'Receiver', 'Receiver.dll')
- amqpnetlite_snd_shim = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite', self.TEST_NAME, 'Sender', 'Sender.dll')
- if path.isfile(amqpnetlite_rcv_shim) and path.isfile(amqpnetlite_snd_shim):
+ amqpnetlite_rcv_shim = os.path.join(QIT_SHIM_HOME, 'amqpnetlite', self.TEST_NAME, 'Receiver', 'Receiver.dll')
+ amqpnetlite_snd_shim = os.path.join(QIT_SHIM_HOME, 'amqpnetlite', self.TEST_NAME, 'Sender', 'Sender.dll')
+ if os.path.isfile(amqpnetlite_rcv_shim) and os.path.isfile(amqpnetlite_snd_shim):
self.shim_map[qpid_interop_test.qit_shim.AmqpNetLiteShim.NAME] = \
qpid_interop_test.qit_shim.AmqpNetLiteShim(amqpnetlite_snd_shim, amqpnetlite_rcv_shim)
else:
@@ -416,14 +416,14 @@ class QitJmsTest(QitTest):
qpid_jms_rcv_shim = 'org.apache.qpid.interop_test.%s.Receiver' % self.TEST_NAME
qpid_jms_snd_shim = 'org.apache.qpid.interop_test.%s.Sender' % self.TEST_NAME
- classpath_file_name = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms', 'cp.txt')
- if path.isfile(classpath_file_name):
+ classpath_file_name = os.path.join(QIT_SHIM_HOME, 'qpid-jms', 'cp.txt')
+ if os.path.isfile(classpath_file_name):
with open(classpath_file_name, 'r') as classpath_file:
classpath = classpath_file.read()
else:
- classpath = path.join(QIT_TEST_SHIM_HOME, 'qpid-jms',
+ classpath = os.path.join(QIT_SHIM_HOME, 'qpid-jms',
'qpid-interop-test-jms-shim-%s-jar-with-dependencies.jar' % QPID_JMS_SHIM_VER)
- if not path.isfile(classpath):
+ if not os.path.isfile(classpath):
print('WARNING: Jar not found: %s' % classpath)
self.shim_map[qpid_interop_test.qit_shim.QpidJmsShim.NAME] = \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org