fixed the cpp/python test integration

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@803270 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 3 insertions, 27 deletions

diff --git a/qpid/cpp/bindings/qmf/tests/python_console.py b/qpid/cpp/bindings/qmf/tests/python_console.py
index 3add79bc51..7a8a2cb9fe 100755
--- a/qpid/cpp/bindings/qmf/tests/python_console.py
+++ b/qpid/cpp/bindings/qmf/tests/python_console.py
@@ -19,28 +19,11 @@
 #
 
 import sys
-from qpid.testlib import TestBase010, testrunner
+from qpid.testlib import TestBase010
 from qpid.datatypes import Message
 from qpid.queue import Empty
 from time import sleep
 
-def scan_args(name, default=None, args=sys.argv[1:]):
-    if (name in args):
-        pos = args.index(name)
-        return args[pos + 1]
-    elif default:
-        return default
-    else:
-        print "Please specify extra argument: %s" % name
-        sys.exit(2)
-
-def extract_args(name, args):
-    if (name in args):
-        pos = args.index(name)
-        del args[pos:pos+2]
-    else:
-        return None
-
 class QmfInteropTests(TestBase010):
 
     def test_A_agent_presence(self):
@@ -74,10 +57,3 @@ class QmfInteropTests(TestBase010):
         if headers:
             return headers[name]
         return None
-
-
-if __name__ == '__main__':
-    args = sys.argv[1:]
-    args.append("python_console")
-
-    if not testrunner.run(args): sys.exit(1)
diff --git a/qpid/cpp/bindings/qmf/tests/run_interop_tests b/qpid/cpp/bindings/qmf/tests/run_interop_tests
index d9f08d5627..e6fc872dbb 100755
--- a/qpid/cpp/bindings/qmf/tests/run_interop_tests
+++ b/qpid/cpp/bindings/qmf/tests/run_interop_tests
@@ -52,12 +52,12 @@ stop_ruby_agent() {
 if test -d ${PYTHON_DIR} ;  then
     start_broker
     echo "Running qmf interop tests using broker on port $BROKER_PORT"
-    PYTHONPATH=${PYTHON_DIR}
+    PYTHONPATH=${PYTHON_DIR}:${MY_DIR}
     export PYTHONPATH
     echo "    Ruby Agent vs. Pure-Python Console"
     start_ruby_agent
     echo "    Ruby agent started at pid $AGENT_PID"
-    ${MY_DIR}/python_console.py -v -s ${SPEC_DIR}/amqp.0-10-qpid-errata.xml -b localhost:$BROKER_PORT $@
+    ${PYTHON_DIR}/qpid-python-test -m python_console -b localhost:$BROKER_PORT $@
     RETCODE=$?
     stop_ruby_agent
     stop_broker