summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Ross <jross@apache.org>2014-04-21 12:59:35 +0000
committerJustin Ross <jross@apache.org>2014-04-21 12:59:35 +0000
commit8c4b2473461edfc03e0c22a41be22445d5258836 (patch)
treee61f9662a4d29773318a3997dfa9ec30eb26698b
parentba1777623520976e9f25c677f72ae7f4c149240f (diff)
downloadqpid-python-8c4b2473461edfc03e0c22a41be22445d5258836.tar.gz
QPID-5714: Revert change that I intended for trunk (it still needs approval)
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1588879 13f79535-47bb-0310-9956-ffa450edef68
-rwxr-xr-xqpid/cpp/src/tests/python_tests5
-rwxr-xr-xqpid/cpp/src/tests/swig_python_tests1
2 files changed, 0 insertions, 6 deletions
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index a36839a43c..babe93c163 100755
--- a/qpid/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
@@ -26,9 +26,4 @@ QPID_PORT=${QPID_PORT:-5672}
PYTHON_TESTS=${PYTHON_TESTS:-$*}
FAILING=${FAILING:-/dev/null}
-if [ ! -d $QPID_TESTS ]; then
- echo "SKIPPED python tests: test code not found"
- exit 0
-fi
-
python $QPID_PYTHON_TEST -m qpid_tests.broker_0_10 -m qpid.tests -b localhost:$QPID_PORT -I $FAILING $PYTHON_TESTS || exit 1
diff --git a/qpid/cpp/src/tests/swig_python_tests b/qpid/cpp/src/tests/swig_python_tests
index 4d9e5e35d4..6de10f5ae9 100755
--- a/qpid/cpp/src/tests/swig_python_tests
+++ b/qpid/cpp/src/tests/swig_python_tests
@@ -47,7 +47,6 @@ stop_broker() {
}
test -f $PYTHONSWIGMODULE || skip "no swigged python client"
-test -d $QPID_TESTS || skip "test code not found"
start_broker
echo "Running swigged python tests using broker on port $QPID_PORT"