summaryrefslogtreecommitdiff
path: root/qpid/python
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-09-24 18:43:44 +0000
committerGordon Sim <gsim@apache.org>2013-09-24 18:43:44 +0000
commitbb40d6411e7bc67858d90c473b718c75a09612b7 (patch)
tree1dc679c78af55f977b0453a1905049efe02351e3 /qpid/python
parent1bace4f20fb8c2c2b21deb2aabce835447023433 (diff)
downloadqpid-python-bb40d6411e7bc67858d90c473b718c75a09612b7.tar.gz
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
Diffstat (limited to 'qpid/python')
-rw-r--r--qpid/python/qpid/tests/messaging/implementation.py10
1 files changed, 7 insertions, 3 deletions
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 *