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 2017/02/17 16:21:49 UTC
qpid-interop-test git commit: QPIDIT-66: Install shims into libexec
directory
Repository: qpid-interop-test
Updated Branches:
refs/heads/master 1bccde68e -> 5b4cc511b
QPIDIT-66: Install shims into libexec directory
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/5b4cc511
Tree: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/tree/5b4cc511
Diff: http://git-wip-us.apache.org/repos/asf/qpid-interop-test/diff/5b4cc511
Branch: refs/heads/master
Commit: 5b4cc511bc1b16295132edf21446ff03f1a96808
Parents: 1bccde6
Author: Kim van der Riet <kp...@apache.org>
Authored: Fri Feb 17 11:21:13 2017 -0500
Committer: Kim van der Riet <kp...@apache.org>
Committed: Fri Feb 17 11:21:13 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 12 ---
setup.py | 81 ++++++++++++--------
shims/amqpnetlite/src/CMakeLists.txt | 2 +-
shims/qpid-jms/pom.xml | 2 +-
.../src/amqp_dtx_test/__init__.py | 19 -----
.../src/amqp_features_test/__init__.py | 19 -----
.../src/amqp_large_content_test/__init__.py | 19 -----
.../src/amqp_types_test/__init__.py | 19 -----
.../src/jms_dtx_test/__init__.py | 19 -----
.../src/jms_hdrs_props_test/__init__.py | 19 -----
.../src/jms_large_content_test/__init__.py | 19 -----
.../src/jms_messages_test/__init__.py | 19 -----
shims/rhea-js/CMakeLists.txt | 2 +-
.../amqp_large_content_test.py | 40 +++-------
src/python/qpid_interop_test/amqp_types_test.py | 32 ++++----
.../qpid_interop_test/jms_hdrs_props_test.py | 20 +++--
.../qpid_interop_test/jms_messages_test.py | 21 +++--
src/python/qpid_interop_test/shims.py | 29 +------
18 files changed, 97 insertions(+), 296 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5665e17..8fcbf6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,15 +43,3 @@ install(CODE "execute_process(COMMAND chmod +x amqp_large_content_test.py
jms_hdrs_props_test.py
jms_messages_test.py
WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/)")
-install(CODE "execute_process(COMMAND chmod +x Receiver.py
- Sender.py
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/qpid-proton-python/amqp_large_content_test/)")
-install(CODE "execute_process(COMMAND chmod +x Receiver.py
- Sender.py
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/qpid-proton-python/amqp_types_test/)")
-install(CODE "execute_process(COMMAND chmod +x Receiver.py
- Sender.py
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/qpid-proton-python/jms_hdrs_props_test/)")
-install(CODE "execute_process(COMMAND chmod +x Receiver.py
- Sender.py
- WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/qpid-proton-python/jms_messages_test/)")
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/setup.py
----------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index 7e56f0e..a0d12e1 100644
--- a/setup.py
+++ b/setup.py
@@ -20,8 +20,8 @@
from distutils.core import setup
-PACKAGE_DIR = 'lib/python2.7/site-packages/qpid_interop_test'
-SHIM_DIR = '%s/shims' % PACKAGE_DIR
+LIBEXEC_DIR = 'libexec/qpid_interop_test'
+SHIM_DIR = '%s/shims' % LIBEXEC_DIR
setup(name='qpid-interop-test',
version='0.1',
@@ -29,35 +29,54 @@ setup(name='qpid-interop-test',
author='Apache Qpid',
author_email='users@qpid.apache.org',
url='http://qpid.apache.org/',
- packages=['qpid_interop_test',
- 'qpid_interop_test/shims/qpid-proton-python/amqp_types_test',
- 'qpid_interop_test/shims/qpid-proton-python/amqp_large_content_test',
- 'qpid_interop_test/shims/qpid-proton-python/jms_hdrs_props_test',
- 'qpid_interop_test/shims/qpid-proton-python/jms_messages_test',
- ],
- package_dir={'qpid_interop_test': 'src/python/qpid_interop_test',
- 'qpid_interop_test/shims/qpid-proton-python/amqp_types_test': 'shims/qpid-proton-python/src/amqp_types_test',
- 'qpid_interop_test/shims/qpid-proton-python/amqp_large_content_test': 'shims/qpid-proton-python/src/amqp_large_content_test',
- 'qpid_interop_test/shims/qpid-proton-python/jms_hdrs_props_test': 'shims/qpid-proton-python/src/jms_hdrs_props_test',
- 'qpid_interop_test/shims/qpid-proton-python/jms_messages_test': 'shims/qpid-proton-python/src/jms_messages_test',
- },
- data_files=[('%s/qpid-jms' % SHIM_DIR, ['shims/qpid-jms/target/qpid-interop-test-jms-shim-0.1.0-SNAPSHOT.jar',
- 'shims/qpid-jms/cp.txt']),
- ('%s/qpid-proton-cpp/amqp_types_test' % SHIM_DIR, ['build/amqp_types_test/Receiver',
- 'build/amqp_types_test/Sender',
- ]
- ),
- ('%s/qpid-proton-cpp/amqp_large_content_test' % SHIM_DIR, ['build/amqp_large_content_test/Receiver',
- 'build/amqp_large_content_test/Sender',
- ],
- ),
- ('%s/qpid-proton-cpp/jms_messages_test' % SHIM_DIR, ['build/jms_messages_test/Receiver',
- 'build/jms_messages_test/Sender',
- ],
- ),
- ('%s/qpid-proton-cpp/jms_hdrs_props_test' % SHIM_DIR, ['build/jms_hdrs_props_test/Receiver',
- 'build/jms_hdrs_props_test/Sender',
- ],
+ 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_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',
+ ]
+ ),
+ ('%s/qpid-jms' % SHIM_DIR,
+ ['shims/qpid-jms/target/qpid-interop-test-jms-shim-0.1.0-SNAPSHOT.jar',
+ 'shims/qpid-jms/cp.txt',
+ ]
+ ),
+ ('%s/qpid-proton-cpp/amqp_types_test' % SHIM_DIR,
+ ['build/amqp_types_test/Receiver',
+ 'build/amqp_types_test/Sender',
+ ]
+ ),
+ ('%s/qpid-proton-cpp/amqp_large_content_test' % SHIM_DIR,
+ ['build/amqp_large_content_test/Receiver',
+ 'build/amqp_large_content_test/Sender',
+ ],
+ ),
+ ('%s/qpid-proton-cpp/jms_messages_test' % SHIM_DIR,
+ ['build/jms_messages_test/Receiver',
+ 'build/jms_messages_test/Sender',
+ ],
+ ),
+ ('%s/qpid-proton-cpp/jms_hdrs_props_test' % SHIM_DIR,
+ ['build/jms_hdrs_props_test/Receiver',
+ 'build/jms_hdrs_props_test/Sender',
+ ],
),
],
)
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/amqpnetlite/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/amqpnetlite/src/CMakeLists.txt b/shims/amqpnetlite/src/CMakeLists.txt
index 5e30bc2..d096158 100644
--- a/shims/amqpnetlite/src/CMakeLists.txt
+++ b/shims/amqpnetlite/src/CMakeLists.txt
@@ -120,7 +120,7 @@ if (BUILD_AMQPNETLITE)
)
# Install
- set(LITE_INSTALL_ROOT ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/amqpnetlite)
+ set(LITE_INSTALL_ROOT ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/amqpnetlite)
install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/amqp_types_test/Receiver/bin/Amqp.Net.dll
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-jms/pom.xml
----------------------------------------------------------------------
diff --git a/shims/qpid-jms/pom.xml b/shims/qpid-jms/pom.xml
index 46ff28b..01c7829 100644
--- a/shims/qpid-jms/pom.xml
+++ b/shims/qpid-jms/pom.xml
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-jms-client</artifactId>
- <version>0.20.0-SNAPSHOT</version>
+ <version>[0.20.0-SNAPSHOT,)</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/amqp_dtx_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_dtx_test/__init__.py b/shims/qpid-proton-python/src/amqp_dtx_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/amqp_dtx_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/amqp_features_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_features_test/__init__.py b/shims/qpid-proton-python/src/amqp_features_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/amqp_features_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/amqp_large_content_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_large_content_test/__init__.py b/shims/qpid-proton-python/src/amqp_large_content_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/amqp_large_content_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/amqp_types_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/amqp_types_test/__init__.py b/shims/qpid-proton-python/src/amqp_types_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/amqp_types_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/jms_dtx_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_dtx_test/__init__.py b/shims/qpid-proton-python/src/jms_dtx_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/jms_dtx_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/jms_hdrs_props_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_hdrs_props_test/__init__.py b/shims/qpid-proton-python/src/jms_hdrs_props_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/jms_hdrs_props_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/jms_large_content_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_large_content_test/__init__.py b/shims/qpid-proton-python/src/jms_large_content_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/jms_large_content_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/qpid-proton-python/src/jms_messages_test/__init__.py
----------------------------------------------------------------------
diff --git a/shims/qpid-proton-python/src/jms_messages_test/__init__.py b/shims/qpid-proton-python/src/jms_messages_test/__init__.py
deleted file mode 100644
index 63a3f41..0000000
--- a/shims/qpid-proton-python/src/jms_messages_test/__init__.py
+++ /dev/null
@@ -1,19 +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.
-#
-
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/shims/rhea-js/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/shims/rhea-js/CMakeLists.txt b/shims/rhea-js/CMakeLists.txt
index ac14232..6163ce2 100644
--- a/shims/rhea-js/CMakeLists.txt
+++ b/shims/rhea-js/CMakeLists.txt
@@ -42,7 +42,7 @@ message(STATUS "BUILD_RHEA = ${BUILD_RHEA}")
if (${BUILD_RHEA})
# Install Rhea client dependencies
- set(SHIM_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/python2.7/site-packages/qpid_interop_test/shims/rhea-js/)
+ set(SHIM_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/libexec/qpid_interop_test/shims/rhea-js/)
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/amqp_types_test/Receiver.js
DESTINATION ${SHIM_INSTALL_PATH}/amqp_types_test/)
install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/amqp_types_test/Sender.js
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/src/python/qpid_interop_test/amqp_large_content_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_large_content_test.py b/src/python/qpid_interop_test/amqp_large_content_test.py
index 602bd0c..1aaf5f3 100755
--- a/src/python/qpid_interop_test/amqp_large_content_test.py
+++ b/src/python/qpid_interop_test/amqp_large_content_test.py
@@ -37,10 +37,11 @@ import qpid_interop_test.shims
from qpid_interop_test.test_type_map import TestTypeMap
# TODO: propose a sensible default when installation details are worked out
-QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
-if QPID_INTEROP_TEST_HOME is None:
- print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+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_TEST_SHIM_HOME = path.join(QIT_INSTALL_PREFIX, 'libexec', 'qpid_interop_test', 'shims')
class AmqpVariableSizeTypes(TestTypeMap):
"""
@@ -172,27 +173,6 @@ def create_testcase_class(amqp_type, shim_product):
-# SHIM_MAP contains an instance of each client language shim that is to be tested as a part of this test. For
-# every shim in this list, a test is dynamically constructed which tests it against itself as well as every
-# other shim in the list.
-#
-# As new shims are added, add them into this map to have them included in the test cases.
-PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_large_content_test',
- 'Receiver')
-PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_large_content_test',
- 'Sender')
-PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python',
- 'amqp_large_content_test', 'Receiver.py')
-PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'amqp_large_content_test',
- 'Sender.py')
-
-SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
- qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
- qpid_interop_test.shims.ProtonPythonShim.NAME: \
- qpid_interop_test.shims.ProtonPythonShim(PROTON_PYTHON_SENDER_SHIM, PROTON_PYTHON_RECEIVER_SHIM),
- }
-
-
class TestOptions(object):
"""
Class controlling command-line arguments used to control the test.
@@ -229,13 +209,11 @@ if __name__ == '__main__':
# other shim in the list.
#
# As new shims are added, add them into this map to have them included in the test cases.
- PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_large_content_test',
- 'Receiver')
- PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_large_content_test',
- 'Sender')
- PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python',
- 'amqp_large_content_test', 'Receiver.py')
- PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'amqp_large_content_test',
+ PROTON_CPP_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'amqp_large_content_test', 'Receiver')
+ PROTON_CPP_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'amqp_large_content_test', 'Sender')
+ PROTON_PYTHON_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'amqp_large_content_test',
+ 'Receiver.py')
+ PROTON_PYTHON_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'amqp_large_content_test',
'Sender.py')
SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/src/python/qpid_interop_test/amqp_types_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/amqp_types_test.py b/src/python/qpid_interop_test/amqp_types_test.py
index feb9f4f..6b6f9fb 100755
--- a/src/python/qpid_interop_test/amqp_types_test.py
+++ b/src/python/qpid_interop_test/amqp_types_test.py
@@ -39,10 +39,11 @@ import qpid_interop_test.shims
from qpid_interop_test.test_type_map import TestTypeMap
# TODO: propose a sensible default when installation details are worked out
-QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
-if QPID_INTEROP_TEST_HOME is None:
- print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+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_TEST_SHIM_HOME = path.join(QIT_INSTALL_PREFIX, 'libexec', 'qpid_interop_test', 'shims')
class AmqpPrimitiveTypes(TestTypeMap):
@@ -438,22 +439,15 @@ if __name__ == '__main__':
# other shim in the list.
#
# As new shims are added, add them into this map to have them included in the test cases.
- PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_types_test',
- 'Receiver')
- PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'amqp_types_test',
- 'Sender')
- PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'amqp_types_test',
- 'Receiver.py')
- PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'amqp_types_test',
- 'Sender.py')
- PROTON_RHEAJS_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'rhea-js', 'amqp_types_test',
- 'Receiver.js')
- PROTON_RHEAJS_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'rhea-js', 'amqp_types_test',
- 'Sender.js')
- AMQPNETLITE_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'amqpnetlite', 'amqp_types_test',
- 'Receiver.exe')
- AMQPNETLITE_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'amqpnetlite', 'amqp_types_test',
- 'Sender.exe')
+ PROTON_CPP_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'amqp_types_test', 'Receiver')
+ PROTON_CPP_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'amqp_types_test', 'Sender')
+ PROTON_PYTHON_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'amqp_types_test', 'Receiver.py')
+ PROTON_PYTHON_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'amqp_types_test', 'Sender.py')
+ PROTON_RHEAJS_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'rhea-js', 'amqp_types_test', 'Receiver.js')
+ PROTON_RHEAJS_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'rhea-js', 'amqp_types_test', 'Sender.js')
+ AMQPNETLITE_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite', 'amqp_types_test', 'Receiver.exe')
+ AMQPNETLITE_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'amqpnetlite', 'amqp_types_test', 'Sender.exe')
+
SHIM_MAP = {qpid_interop_test.shims.ProtonCppShim.NAME: \
qpid_interop_test.shims.ProtonCppShim(PROTON_CPP_SENDER_SHIM, PROTON_CPP_RECEIVER_SHIM),
qpid_interop_test.shims.ProtonPythonShim.NAME: \
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/src/python/qpid_interop_test/jms_hdrs_props_test.py
----------------------------------------------------------------------
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 0264ca5..61103a8 100755
--- a/src/python/qpid_interop_test/jms_hdrs_props_test.py
+++ b/src/python/qpid_interop_test/jms_hdrs_props_test.py
@@ -38,10 +38,11 @@ from qpid_interop_test.test_type_map import TestTypeMap
# TODO: propose a sensible default when installation details are worked out
-QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
-if QPID_INTEROP_TEST_HOME is None:
- print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+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_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):
@@ -617,15 +618,12 @@ class TestOptions(object):
if __name__ == '__main__':
- PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'jms_hdrs_props_test',
- 'Receiver')
- PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'jms_hdrs_props_test',
- 'Sender')
- PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'jms_hdrs_props_test',
+ PROTON_CPP_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'jms_hdrs_props_test', 'Receiver')
+ PROTON_CPP_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'jms_hdrs_props_test', 'Sender')
+ PROTON_PYTHON_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-python', 'jms_hdrs_props_test',
'Receiver.py')
- PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'jms_hdrs_props_test',
- 'Sender.py')
- QIT_JMS_CLASSPATH_FILE = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-jms', 'cp.txt')
+ 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()
QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_hdrs_props_test.Receiver'
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/src/python/qpid_interop_test/jms_messages_test.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/jms_messages_test.py b/src/python/qpid_interop_test/jms_messages_test.py
index 3d83190..5b76aef 100755
--- a/src/python/qpid_interop_test/jms_messages_test.py
+++ b/src/python/qpid_interop_test/jms_messages_test.py
@@ -38,10 +38,11 @@ from qpid_interop_test.test_type_map import TestTypeMap
# TODO: propose a sensible default when installation details are worked out
-QPID_INTEROP_TEST_HOME = getenv('QPID_INTEROP_TEST_HOME')
-if QPID_INTEROP_TEST_HOME is None:
- print 'ERROR: Environment variable QPID_INTEROP_TEST_HOME is not set'
+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_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):
@@ -328,15 +329,11 @@ class TestOptions(object):
if __name__ == '__main__':
- PROTON_CPP_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'jms_messages_test',
- 'Receiver')
- PROTON_CPP_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-cpp', 'jms_messages_test',
- 'Sender')
- PROTON_PYTHON_RECEIVER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'jms_messages_test',
- 'Receiver.py')
- PROTON_PYTHON_SENDER_SHIM = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-proton-python', 'jms_messages_test',
- 'Sender.py')
- QIT_JMS_CLASSPATH_FILE = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-jms', 'cp.txt')
+ PROTON_CPP_RECEIVER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'jms_messages_test', 'Receiver')
+ PROTON_CPP_SENDER_SHIM = path.join(QIT_TEST_SHIM_HOME, 'qpid-proton-cpp', 'jms_messages_test', 'Sender')
+ 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()
QPID_JMS_RECEIVER_SHIM = 'org.apache.qpid.interop_test.jms_messages_test.Receiver'
http://git-wip-us.apache.org/repos/asf/qpid-interop-test/blob/5b4cc511/src/python/qpid_interop_test/shims.py
----------------------------------------------------------------------
diff --git a/src/python/qpid_interop_test/shims.py b/src/python/qpid_interop_test/shims.py
index b0adafa..3ca598a 100644
--- a/src/python/qpid_interop_test/shims.py
+++ b/src/python/qpid_interop_test/shims.py
@@ -116,6 +116,8 @@ class Sender(ShimWorkerThread):
self.return_obj = stdoutdata
else: # Make a single line of all the bits and return that
self.return_obj = stdoutdata
+ except OSError as exc:
+ self.return_obj = str(exc) + ': shim=' + self.arg_list[0]
except CalledProcessError as exc:
self.return_obj = str(exc) + '\n\nOutput:\n' + exc.output
@@ -148,6 +150,8 @@ class Receiver(ShimWorkerThread):
self.return_obj = stdoutdata
else: # Make a single line of all the bits and return that
self.return_obj = stdoutdata
+ except OSError as exc:
+ self.return_obj = str(exc) + ': shim=' + self.arg_list[0]
except CalledProcessError as exc:
self.return_obj = str(exc) + '\n\n' + exc.output
@@ -210,27 +214,9 @@ class QpidJmsShim(Shim):
# TODO: Automate this - it gets out of date quickly
# Maven works out all the deps, should use that
QPID_JMS_SHIM_VER = '0.1.0-SNAPSHOT'
- QPID_JMS_VER = '0.20.0-SNAPSHOT'
- QPID_PROTON_J_VER = '0.15.0-SNAPSHOT'
- JMS_API_VER = '1.1.1'
- LOGGER_API_VER = '1.7.21'
- LOGGER_IMPL_VER = '1.7.21'
- NETTY_VER = '4.0.40.Final'
# Classpath components
- #QPID_INTEROP_TEST_SHIM_JAR = path.join(QPID_INTEROP_TEST_HOME, 'shims', 'qpid-jms', 'target', 'qpid-jms-shim.jar')
MAVEN_REPO_PATH = path.join(getenv('HOME'), '.m2', 'repository')
- JMS_API_JAR = path.join(MAVEN_REPO_PATH, 'org', 'apache', 'geronimo', 'specs', 'geronimo-jms_1.1_spec', JMS_API_VER,
- 'geronimo-jms_1.1_spec-%s.jar' % JMS_API_VER)
- JMS_IMPL_JAR = path.join(MAVEN_REPO_PATH, 'org', 'apache', 'qpid', 'qpid-jms-client', QPID_JMS_VER,
- 'qpid-jms-client-%s.jar' % QPID_JMS_VER)
- LOGGER_API_JAR = path.join(MAVEN_REPO_PATH, 'org', 'slf4j', 'slf4j-api', LOGGER_API_VER,
- 'slf4j-api-%s.jar' % LOGGER_API_VER)
- LOGGER_IMPL_JAR = path.join(MAVEN_REPO_PATH, 'org', 'slf4j', 'slf4j-nop', LOGGER_IMPL_VER,
- 'slf4j-nop-%s.jar' % LOGGER_IMPL_VER)
- PROTON_J_JAR = path.join(MAVEN_REPO_PATH, 'org', 'apache', 'qpid', 'proton-j', QPID_PROTON_J_VER,
- 'proton-j-%s.jar' % QPID_PROTON_J_VER)
- NETTY_JAR = path.join(MAVEN_REPO_PATH, 'io', 'netty', 'netty-all', NETTY_VER, 'netty-all-%s.jar' % NETTY_VER)
QPID_JMS_SHIM_JAR = path.join(MAVEN_REPO_PATH, 'org', 'apache', 'qpid', 'qpid-interop-test-jms-shim',
QPID_JMS_SHIM_VER, 'qpid-interop-test-jms-shim-%s.jar' % QPID_JMS_SHIM_VER)
@@ -246,13 +232,6 @@ class QpidJmsShim(Shim):
def get_java_class_path(self):
"""Method to construct and return the Java class path necessary to run the shim"""
return ':'.join([self.QPID_JMS_SHIM_JAR, self.dependency_class_path])
- # self.JMS_API_JAR,
- # self.JMS_IMPL_JAR,
- # self.LOGGER_API_JAR,
- # self.LOGGER_IMPL_JAR,
- # self.PROTON_J_JAR,
- # self.NETTY_JAR])
-
class AmqpNetLiteShim(Shim):
"""Shim for AMQP.Net Lite client"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org