QPID-7207: Skip some tests when the swigged python client is not available

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

2 files changed, 29 insertions, 19 deletions

diff --git a/qpid/cpp/src/tests/run_interop_tests b/qpid/cpp/src/tests/run_interop_tests
index 0a2e1425be..7507c6a99f 100755
--- a/qpid/cpp/src/tests/run_interop_tests
+++ b/qpid/cpp/src/tests/run_interop_tests
@@ -21,10 +21,15 @@
 
 from common import *
 
-port = start_broker("broker", "--load-module {0}".format(AMQP_LIB))
+python_swig_module = join(BUILD_DIR, "bindings", "qpid", "python", "qpid_messaging.py")
 
-ENV["QPID_INTEROP_URL"] = "localhost:{0}".format(port)
+if exists(python_swig_module):
+    port = start_broker("broker", "--load-module {0}".format(AMQP_LIB))
 
-call("qpid-python-test -m interop_tests -DOUTDIR={0}", WORK_DIR)
+    ENV["QPID_INTEROP_URL"] = "localhost:{0}".format(port)
+
+    call("qpid-python-test -m interop_tests -DOUTDIR={0}", WORK_DIR)
+else:
+    warn("Skipping tests: 1.0 messaging client not found")
 
 check_results()
diff --git a/qpid/cpp/src/tests/run_python_tests b/qpid/cpp/src/tests/run_python_tests
index cde574a126..53a9aa54f5 100755
--- a/qpid/cpp/src/tests/run_python_tests
+++ b/qpid/cpp/src/tests/run_python_tests
@@ -37,26 +37,31 @@ run_broker_tests(port, "-m qpid_tests.broker_0_10 -m qpid.tests")
 
 # Swigged python tests
 
-failing_tests = join(BUILD_DIR, "src", "tests", "failing-amqp0-10-python-tests")
+python_swig_module = join(BUILD_DIR, "bindings", "qpid", "python", "qpid_messaging.py")
 
-ENV["QPID_USE_SWIG_CLIENT"] = "1"
+if exists(python_swig_module):
+    failing_tests = join(BUILD_DIR, "src", "tests", "failing-amqp0-10-python-tests")
 
-run_broker_tests(port, 
-                 "-m qpid.tests.messaging.message",
-                 "-m qpid_tests.broker_0_10.priority",
-                 "-m qpid_tests.broker_0_10.lvq",
-                 "-m qpid_tests.broker_0_10.new_api",
-                 "-I {0}".format(failing_tests))
+    ENV["QPID_USE_SWIG_CLIENT"] = "1"
 
-if AMQP_LIB is not None:
-    failing_tests = join(BUILD_DIR, "src", "tests", "failing-amqp1.0-python-tests")
-
-    run_broker_tests(port,
-                     "--define=\"protocol_version=amqp1.0\"",
-                     "--define=\"policy_file={0}\"".format(acl_file),
-                     "-m qpid_tests.broker_1_0",
+    run_broker_tests(port, 
+                     "-m qpid.tests.messaging.message",
+                     "-m qpid_tests.broker_0_10.priority",
+                     "-m qpid_tests.broker_0_10.lvq",
                      "-m qpid_tests.broker_0_10.new_api",
-                     "-m assertions -m reject_release -m misc -m policies -m acl_1",
                      "-I {0}".format(failing_tests))
 
+    if AMQP_LIB is not None:
+        failing_tests = join(BUILD_DIR, "src", "tests", "failing-amqp1.0-python-tests")
+
+        run_broker_tests(port,
+                         "--define=\"protocol_version=amqp1.0\"",
+                         "--define=\"policy_file={0}\"".format(acl_file),
+                         "-m qpid_tests.broker_1_0",
+                         "-m qpid_tests.broker_0_10.new_api",
+                         "-m assertions -m reject_release -m misc -m policies -m acl_1",
+                         "-I {0}".format(failing_tests))
+else:
+    warn("Skipping tests for swigged python client: swigged module not found")
+    
 check_results()