From bb40d6411e7bc67858d90c473b718c75a09612b7 Mon Sep 17 00:00:00 2001 From: Gordon Sim Date: Tue, 24 Sep 2013 18:43:44 +0000 Subject: QPID-5142: require swig client to be explicitly selected for tests git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1525969 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/swig_python_tests | 1 + qpid/python/qpid/tests/messaging/implementation.py | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests index 8c7d8cfe6d..a10878f712 100755 --- a/qpid/cpp/src/tests/swig_python_tests +++ b/qpid/cpp/src/tests/swig_python_tests @@ -50,6 +50,7 @@ start_broker echo "Running swigged python tests using broker on port $QPID_PORT" export PYTHONPATH=$PYTHONPATH:$PYTHONPATH_SWIG +export QPID_USE_SWIG_CLIENT=1 $QPID_PYTHON_TEST -m qpid.tests.messaging.message -m qpid_tests.broker_0_10.priority -m qpid_tests.broker_0_10.lvq -m qpid_tests.broker_0_10.new_api -b localhost:$QPID_PORT -I $srcdir/failing-amqp0-10-python-tests || FAILED=1 if [[ -a $AMQPC_LIB ]] ; then export QPID_LOAD_MODULE=$AMQPC_LIB diff --git a/qpid/python/qpid/tests/messaging/implementation.py b/qpid/python/qpid/tests/messaging/implementation.py index c81fb6c99c..fce60c6f38 100644 --- a/qpid/python/qpid/tests/messaging/implementation.py +++ b/qpid/python/qpid/tests/messaging/implementation.py @@ -16,9 +16,13 @@ # specific language governing permissions and limitations # under the License. # -try: +import os +if 'QPID_USE_SWIG_CLIENT' in os.environ and os.environ['QPID_USE_SWIG_CLIENT']: + try: from qpid_messaging import * from qpid.datatypes import uuid4 -except ImportError, e: - print "Falling back to pure bindings, %s" % e + except ImportError, e: + print "Swigged client not found. Falling back to pure bindings, %s\n" % e from qpid.messaging import * +else: + from qpid.messaging import * -- cgit v1.2.1