summaryrefslogtreecommitdiff
path: root/qpid
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2013-09-19 09:32:13 +0000
committerGordon Sim <gsim@apache.org>2013-09-19 09:32:13 +0000
commit63a5fd8d30e3fec9cecf5fe0ef7681bc5f310766 (patch)
treef4b48a2eafc40c140352be28c32da618eca2485f /qpid
parent2414494947e9761548321ed6da9fbfc303f42f8d (diff)
downloadqpid-python-63a5fd8d30e3fec9cecf5fe0ef7681bc5f310766.tar.gz
QPID-4952: Fix swigged python tests which were disabled by previous commit
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1524669 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid')
-rw-r--r--qpid/cpp/src/tests/test_env.sh.in2
-rw-r--r--qpid/python/qpid/tests/messaging/implementation.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/test_env.sh.in b/qpid/cpp/src/tests/test_env.sh.in
index 60cc458f75..486034ca3b 100644
--- a/qpid/cpp/src/tests/test_env.sh.in
+++ b/qpid/cpp/src/tests/test_env.sh.in
@@ -47,7 +47,7 @@ export QPID_CONFIG_EXEC=$PYTHON_COMMANDS/qpid-config
export QPID_ROUTE_EXEC=$PYTHON_COMMANDS/qpid-route
export QPID_HA_EXEC=$PYTHON_COMMANDS/qpid-ha
export PYTHONPATH_SWIG=$pythonswigdir:$pythonswiglibdir
-export PYTHONSWIGMODULE=$pythonswigdir/cqpid.py
+export PYTHONSWIGMODULE=$pythonswigdir/qpid_messaging.py
# Executables
export QPIDD_EXEC=$top_builddir/src/qpidd
diff --git a/qpid/python/qpid/tests/messaging/implementation.py b/qpid/python/qpid/tests/messaging/implementation.py
index ac0e02dba7..c81fb6c99c 100644
--- a/qpid/python/qpid/tests/messaging/implementation.py
+++ b/qpid/python/qpid/tests/messaging/implementation.py
@@ -17,7 +17,7 @@
# under the License.
#
try:
- from cqpid import *
+ from qpid_messaging import *
from qpid.datatypes import uuid4
except ImportError, e:
print "Falling back to pure bindings, %s" % e