diff options
| author | Justin Ross <jross@apache.org> | 2014-04-21 14:13:29 +0000 |
|---|---|---|
| committer | Justin Ross <jross@apache.org> | 2014-04-21 14:13:29 +0000 |
| commit | 947d29b0e67b23f60f3c6a3888a468a5e24afdd4 (patch) | |
| tree | d0819ecfaa0941a34ad3f9cdaf2042d167400fa8 | |
| parent | 130ff22d820d9c20a1bc7545031954ae59dad0ef (diff) | |
| download | qpid-python-947d29b0e67b23f60f3c6a3888a468a5e24afdd4.tar.gz | |
QPID-5714: Skip python tests if test code is missing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1588883 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | qpid/cpp/src/tests/python_tests | 5 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/swig_python_tests | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests index babe93c163..a36839a43c 100755 --- a/qpid/cpp/src/tests/python_tests +++ b/qpid/cpp/src/tests/python_tests @@ -26,4 +26,9 @@ 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 6de10f5ae9..4d9e5e35d4 100755 --- a/qpid/cpp/src/tests/swig_python_tests +++ b/qpid/cpp/src/tests/swig_python_tests @@ -47,6 +47,7 @@ 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" |