summaryrefslogtreecommitdiff
path: root/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
commitc62980d4592ec5094fbd0b353ccf6942a57ebff0 (patch)
tree0d39f4e08e5e5f9b5267ddafac3dcbd2ba3c5326 /python
parentd958670f218880c91edcd741c8c3547c54e31a77 (diff)
downloadqpid-python-c62980d4592ec5094fbd0b353ccf6942a57ebff0.tar.gz
QPID-5142: require swig client to be explicitly selected for tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1525969 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'python')
-rw-r--r--python/qpid/tests/messaging/implementation.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/python/qpid/tests/messaging/implementation.py b/python/qpid/tests/messaging/implementation.py
index c81fb6c99c..fce60c6f38 100644
--- a/python/qpid/tests/messaging/implementation.py
+++ b/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 *