[rhmessaging-commits] rhmessaging commits: r3357 - store/trunk/cpp/tests.

[rhmessaging-commits at lists.jboss.org]

Author: kpvdr
Date: 2009-05-06 12:58:58 -0400 (Wed, 06 May 2009)
New Revision: 3357

Modified:
   store/trunk/cpp/tests/Makefile.am
   store/trunk/cpp/tests/run_python_tests
Log:
Switched over to using the new python test framework broker start and stop in preparation for adding cluster tests

Modified: store/trunk/cpp/tests/Makefile.am
===================================================================
--- store/trunk/cpp/tests/Makefile.am	2009-05-05 19:52:38 UTC (rev 3356)
+++ store/trunk/cpp/tests/Makefile.am	2009-05-06 16:58:58 UTC (rev 3357)
@@ -78,6 +78,7 @@
 
 TESTS_ENVIRONMENT = \
   QPID_DIR=$(QPID_DIR) \
+  QPIDD=$(QPID_DIR)/cpp/src/qpidd \
   VALGRIND=$(VALGRIND) \
   abs_srcdir=$(abs_srcdir) \
   LIBBDBSTORE=$(abs_builddir)/../lib/.libs/msgstore.so \

Modified: store/trunk/cpp/tests/run_python_tests
===================================================================
--- store/trunk/cpp/tests/run_python_tests	2009-05-05 19:52:38 UTC (rev 3356)
+++ store/trunk/cpp/tests/run_python_tests	2009-05-06 16:58:58 UTC (rev 3357)
@@ -56,25 +56,11 @@
     echo "WARNING: Path(s) in ${PYTHONPATH} not found - skipping python tests."
     exit 1
 else
-    # 1. Start broker
-    echo -n "Starting broker... "
-	${abs_srcdir}/start_broker "$@" ${BROKER_OPTS} || { echo "FAIL broker start";  exit 1; }
-    if ! test -f qpidd.port; then
-        echo "FAIL no qpidd.port file found - broker may have failed to start"
-        exit 1
-    fi
-    port=`cat qpidd.port`
-    echo "port=${port} ok"
-
-    # 2. Run all python tests
+    # Run all python tests
     pwdir=$(pwd)
     cd ${QPID_PYTHON_DIR}
-    ./run-tests --skip-self-test -v -s ${AMQP_SPEC} -I ${FAILING_PYTHON_TESTS} -b localhost:${port} ${PYTHON_TESTS} || { echo "FAIL python tests for ${SPEC}"; fail=1; }
+    ./run-tests --skip-self-test -v -s ${AMQP_SPEC} -I ${FAILING_PYTHON_TESTS} -B "${BROKER_OPTS}" ${PYTHON_TESTS} || { echo "FAIL python tests for ${AMQP_SPEC}"; fail=1; }
     cd ${pwdir}
 
-    #3. Stop broker
-    echo -n "Stopping broker on port ${port}... "
-	${abs_srcdir}/stop_broker || { echo "FAIL broker stop"; fail=1; }
-    echo "ok"
     exit ${fail}
 fi